Merge pull request #1678 from PratikMahajan/add-custom-sig-stores

OTA-916: add SignatureStores to ClusterVersionSpec

config/v1/0000_00_cluster-version-operator_01_clusterversion.crd.yaml → config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml

@@ -5,6 +5,7 @@ metadata:
     api-approved.openshift.io: https://github.com/openshift/api/pull/495
     include.release.openshift.io/self-managed-high-availability: "true"
     include.release.openshift.io/single-node-developer: "true"
+    release.openshift.io/feature-set: Default
   name: clusterversions.config.openshift.io
 spec:
   group: config.openshift.io
@@ -147,6 +148,12 @@ spec:
                       unmanaged:
                         description: 'unmanaged controls if cluster version operator should stop managing the resources in this cluster. Default: false'
                         type: boolean
+                  x-kubernetes-list-map-keys:
+                    - kind
+                    - group
+                    - namespace
+                    - name
+                  x-kubernetes-list-type: map
                 upstream:
                   description: upstream may be used to specify the preferred update server. By default it will use the appropriate update server for the cluster and region.
                   type: string
@@ -171,6 +178,7 @@ spec:
                         type: array
                         items:
                           type: string
+                        x-kubernetes-list-type: set
                       image:
                         description: image is a container image location that contains the update. When this field is part of spec, image is optional if version is specified and the availableUpdates field contains a matching version.
                         type: string
@@ -181,6 +189,7 @@ spec:
                         description: version is a semantic version identifying the update version. When this field is part of spec, version is optional if image is specified.
                         type: string
                   nullable: true
+                  x-kubernetes-list-type: atomic
                 capabilities:
                   description: capabilities describes the state of optional, core cluster components.
                   type: object
@@ -295,6 +304,7 @@ spec:
                             type: array
                             items:
                               type: string
+                            x-kubernetes-list-type: set
                           image:
                             description: image is a container image location that contains the update. When this field is part of spec, image is optional if version is specified and the availableUpdates field contains a matching version.
                             type: string
@@ -387,6 +397,9 @@ spec:
                       type:
                         description: type specifies the aspect reported by this condition.
                         type: string
+                  x-kubernetes-list-map-keys:
+                    - type
+                  x-kubernetes-list-type: map
                 desired:
                   description: desired is the version that the cluster is reconciling towards. If the cluster is not yet fully initialized desired will be set with the information available, which may be an image or a tag.
                   type: object
@@ -396,6 +409,7 @@ spec:
                       type: array
                       items:
                         type: string
+                      x-kubernetes-list-type: set
                     image:
                       description: image is a container image location that contains the update. When this field is part of spec, image is optional if version is specified and the availableUpdates field contains a matching version.
                       type: string
@@ -442,6 +456,7 @@ spec:
                       version:
                         description: version is a semantic version identifying the update version. If the requested image does not define a version, or if a failure occurs retrieving the image, this value may be empty.
                         type: string
+                  x-kubernetes-list-type: atomic
                 observedGeneration:
                   description: observedGeneration reports which version of the spec is being synced. If this value is not equal to metadata.generation, then the desired and conditions fields may represent a previous version.
                   type: integer