Merge pull request #2029 from deads2k/apply-01-fix-generations

API-1835: make operator generations behave as a map list type
openshift · Sep 18, 2024 · 07bccfd · 07bccfd
2 parents 1d61618 + 8abc53a
commit 07bccfd
Show file tree

Hide file tree

Showing 68 changed files with 1,060 additions and 114 deletions.
diff --git a/imageregistry/v1/zz_generated.crd-manifests/00_configs.crd.yaml b/imageregistry/v1/zz_generated.crd-manifests/00_configs.crd.yaml
@@ -1987,9 +1987,19 @@ spec:
                       description: resource is the resource type of the thing you're
                         tracking
                       type: string
+                  required:
+                  - group
+                  - name
+                  - namespace
+                  - resource
                   type: object
                 type: array
-                x-kubernetes-list-type: atomic
+                x-kubernetes-list-map-keys:
+                - group
+                - resource
+                - namespace
+                - name
+                x-kubernetes-list-type: map
               observedGeneration:
                 description: observedGeneration is the last generation change you've
                   dealt with

diff --git a/...d.featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/AAA_ungated.yaml b/...d.featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/AAA_ungated.yaml
@@ -1958,9 +1958,19 @@ spec:
                       description: resource is the resource type of the thing you're
                         tracking
                       type: string
+                  required:
+                  - group
+                  - name
+                  - namespace
+                  - resource
                   type: object
                 type: array
-                x-kubernetes-list-type: atomic
+                x-kubernetes-list-map-keys:
+                - group
+                - resource
+                - namespace
+                - name
+                x-kubernetes-list-type: map
               observedGeneration:
                 description: observedGeneration is the last generation change you've
                   dealt with

diff --git a/....featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/ChunkSizeMiB.yaml b/....featuregated-crd-manifests/configs.imageregistry.operator.openshift.io/ChunkSizeMiB.yaml
@@ -1971,9 +1971,19 @@ spec:
                       description: resource is the resource type of the thing you're
                         tracking
                       type: string
+                  required:
+                  - group
+                  - name
+                  - namespace
+                  - resource
                   type: object
                 type: array
-                x-kubernetes-list-type: atomic
+                x-kubernetes-list-map-keys:
+                - group
+                - resource
+                - namespace
+                - name
+                x-kubernetes-list-type: map
               observedGeneration:
                 description: observedGeneration is the last generation change you've
                   dealt with