generate manifests and CRD definition

GoogleCloudPlatform · Jun 20, 2024 · 15f6ca1 · 15f6ca1
1 parent 721fd7c
commit 15f6ca1
Show file tree

Hide file tree

Showing 8 changed files with 125 additions and 0 deletions.
diff --git a/...ions.k8s.io_v1_customresourcedefinition_storagebuckets.storage.cnrm.cloud.google.com.yaml b/...ions.k8s.io_v1_customresourcedefinition_storagebuckets.storage.cnrm.cloud.google.com.yaml
@@ -287,6 +287,23 @@ spec:
                 required:
                 - retentionPeriod
                 type: object
+              softDeletePolicy:
+                description: The bucket's soft delete policy, which defines the period
+                  of time that soft-deleted objects will be retained, and cannot be
+                  permanently deleted. If it is not provided, by default Google Cloud
+                  Storage sets this to default soft delete policy.
+                properties:
+                  effectiveTime:
+                    description: Server-determined value that indicates the time from
+                      which the policy, or one with a greater retention, was effective.
+                      This value is in RFC 3339 format.
+                    type: string
+                  retentionDurationSeconds:
+                    description: The duration in seconds that soft-deleted objects
+                      in the bucket will be retained and cannot be permanently deleted.
+                      Default value is 604800.
+                    type: integer
+                type: object
               storageClass:
                 description: 'The Storage Class of the new bucket. Supported values
                   include: STANDARD, MULTI_REGIONAL, REGIONAL, NEARLINE, COLDLINE,
@@ -353,6 +370,27 @@ spec:
                   current reported status reflects the most recent desired state of
                   the resource.
                 type: integer
+              observedState:
+                description: The observed state of the underlying GCP resource.
+                properties:
+                  softDeletePolicy:
+                    description: The bucket's soft delete policy, which defines the
+                      period of time that soft-deleted objects will be retained, and
+                      cannot be permanently deleted. If it is not provided, by default
+                      Google Cloud Storage sets this to default soft delete policy.
+                    properties:
+                      effectiveTime:
+                        description: Server-determined value that indicates the time
+                          from which the policy, or one with a greater retention,
+                          was effective. This value is in RFC 3339 format.
+                        type: string
+                      retentionDurationSeconds:
+                        description: The duration in seconds that soft-deleted objects
+                          in the bucket will be retained and cannot be permanently
+                          deleted. Default value is 604800.
+                        type: integer
+                    type: object
+                type: object
               selfLink:
                 description: The URI of the created resource.
                 type: string

diff --git a/config/samples/resources/storagebucket/storage_v1beta1_storagebucket.yaml b/config/samples/resources/storagebucket/storage_v1beta1_storagebucket.yaml
@@ -36,3 +36,5 @@ spec:
       method: ["GET", "HEAD", "DELETE"]
       maxAgeSeconds: 3600
   uniformBucketLevelAccess: true
+  softDeletePolicy:
+    retentionDurationSeconds: 604800
diff --git a/config/servicemappings/storage.yaml b/config/servicemappings/storage.yaml
@@ -36,6 +36,9 @@ spec:
         labels: labels
       resourceID:
         targetField: name
+      observedFields:
+        - soft_delete_policy.effective_time
+        - soft_delete_policy.retention_duration_seconds
       idTemplate: "{{name}}"
       # odd resource where the project is 'optional', needs more thought -- also not supported by gcloud (yet), problem applies to all Storage resources
       idTemplateCanBeUsedToMatchResourceName: false

diff --git a/pkg/clients/generated/apis/storage/v1beta1/storagebucket_types.go b/pkg/clients/generated/apis/storage/v1beta1/storagebucket_types.go
diff --git a/pkg/clients/generated/apis/storage/v1beta1/zz_generated.deepcopy.go b/pkg/clients/generated/apis/storage/v1beta1/zz_generated.deepcopy.go
diff --git a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/create.yaml b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/create.yaml
@@ -26,3 +26,5 @@ spec:
         type: Delete
       condition:
         age: 7
+  softDeletePolicy:
+    retentionDurationSeconds: 604800
diff --git a/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/update.yaml b/pkg/test/resourcefixture/testdata/basic/storage/v1beta1/storagebucket/update.yaml
@@ -23,3 +23,5 @@ spec:
   versioning:
     enabled: true
   lifecycleRule: []
+  softDeletePolicy:
+    retentionDurationSeconds: 0
diff --git a/...oogle3-docs/resource-reference/generated/resource-docs/storage/storagebucket.md b/...oogle3-docs/resource-reference/generated/resource-docs/storage/storagebucket.md
@@ -156,6 +156,9 @@ resourceID: string
 retentionPolicy:
   isLocked: boolean
   retentionPeriod: integer
+softDeletePolicy:
+  effectiveTime: string
+  retentionDurationSeconds: integer
 storageClass: string
 uniformBucketLevelAccess: boolean
 versioning:
@@ -684,6 +687,36 @@ Enables Bucket PolicyOnly access to a bucket.{% endverbatim %}</p>
             <p>{% verbatim %}The period of time, in seconds, that objects in the bucket must be retained and cannot be deleted, overwritten, or archived. The value must be less than 3,155,760,000 seconds.{% endverbatim %}</p>
         </td>
     </tr>
+    <tr>
+        <td>
+            <p><code>softDeletePolicy</code></p>
+            <p><i>Optional</i></p>
+        </td>
+        <td>
+            <p><code class="apitype">object</code></p>
+            <p>{% verbatim %}The bucket's soft delete policy, which defines the period of time that soft-deleted objects will be retained, and cannot be permanently deleted. If it is not provided, by default Google Cloud Storage sets this to default soft delete policy.{% endverbatim %}</p>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <p><code>softDeletePolicy.effectiveTime</code></p>
+            <p><i>Optional</i></p>
+        </td>
+        <td>
+            <p><code class="apitype">string</code></p>
+            <p>{% verbatim %}Server-determined value that indicates the time from which the policy, or one with a greater retention, was effective. This value is in RFC 3339 format.{% endverbatim %}</p>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <p><code>softDeletePolicy.retentionDurationSeconds</code></p>
+            <p><i>Optional</i></p>
+        </td>
+        <td>
+            <p><code class="apitype">integer</code></p>
+            <p>{% verbatim %}The duration in seconds that soft-deleted objects in the bucket will be retained and cannot be permanently deleted. Default value is 604800.{% endverbatim %}</p>
+        </td>
+    </tr>
     <tr>
         <td>
             <p><code>storageClass</code></p>