Skip to content

Commit f356bd9

Browse files
Merge pull request #1678 from PratikMahajan/add-custom-sig-stores
OTA-916: add SignatureStores to ClusterVersionSpec
2 parents 74f9448 + b994043 commit f356bd9

13 files changed

+2214
-15
lines changed

config/v1/0000_00_cluster-version-operator_01_clusterversion-CustomNoUpgrade.crd.yaml

+503
Large diffs are not rendered by default.

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

+15
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
api-approved.openshift.io: https://github.com/openshift/api/pull/495
66
include.release.openshift.io/self-managed-high-availability: "true"
77
include.release.openshift.io/single-node-developer: "true"
8+
release.openshift.io/feature-set: Default
89
name: clusterversions.config.openshift.io
910
spec:
1011
group: config.openshift.io
@@ -147,6 +148,12 @@ spec:
147148
unmanaged:
148149
description: 'unmanaged controls if cluster version operator should stop managing the resources in this cluster. Default: false'
149150
type: boolean
151+
x-kubernetes-list-map-keys:
152+
- kind
153+
- group
154+
- namespace
155+
- name
156+
x-kubernetes-list-type: map
150157
upstream:
151158
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.
152159
type: string
@@ -171,6 +178,7 @@ spec:
171178
type: array
172179
items:
173180
type: string
181+
x-kubernetes-list-type: set
174182
image:
175183
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.
176184
type: string
@@ -181,6 +189,7 @@ spec:
181189
description: version is a semantic version identifying the update version. When this field is part of spec, version is optional if image is specified.
182190
type: string
183191
nullable: true
192+
x-kubernetes-list-type: atomic
184193
capabilities:
185194
description: capabilities describes the state of optional, core cluster components.
186195
type: object
@@ -295,6 +304,7 @@ spec:
295304
type: array
296305
items:
297306
type: string
307+
x-kubernetes-list-type: set
298308
image:
299309
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.
300310
type: string
@@ -387,6 +397,9 @@ spec:
387397
type:
388398
description: type specifies the aspect reported by this condition.
389399
type: string
400+
x-kubernetes-list-map-keys:
401+
- type
402+
x-kubernetes-list-type: map
390403
desired:
391404
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.
392405
type: object
@@ -396,6 +409,7 @@ spec:
396409
type: array
397410
items:
398411
type: string
412+
x-kubernetes-list-type: set
399413
image:
400414
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.
401415
type: string
@@ -442,6 +456,7 @@ spec:
442456
version:
443457
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.
444458
type: string
459+
x-kubernetes-list-type: atomic
445460
observedGeneration:
446461
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.
447462
type: integer

config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml

+503
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)