Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OTA-916: add SignatureStores to ClusterVersionSpec #1678

Merged
merged 5 commits into from
Dec 6, 2023
Merged

OTA-916: add SignatureStores to ClusterVersionSpec #1678

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d09f5c2
add SignatureStores to ClusterVersionSpec
PratikMahajan Nov 23, 2023
85597e9
Add TechPreviewNoUpgrade gate to SignatureStores
PratikMahajan Nov 29, 2023
6164bff
operator/v1/types: Declare Kubebuilder list semantics for CVO
PratikMahajan Nov 29, 2023
52aca23
Require CA cert configmap ref for each SignatureStore URL
PratikMahajan Nov 30, 2023
b994043
Enable CustomNoUpgrade feature set for CVO
PratikMahajan Dec 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions ...rsion-operator_01_clusterversion.crd.yaml → ...erator_01_clusterversion-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
503 changes: 503 additions & 0 deletions config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
PratikMahajan marked this conversation as resolved.
Show resolved Hide resolved

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions config/v1/feature_gates.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -391,4 +391,14 @@ var (
ResponsiblePerson: "jspeed",
OwningProduct: kubernetes,
}

FeatureGateSignatureStores = FeatureGateName("SignatureStores")
signatureStores = FeatureGateDescription{
FeatureGateAttributes: FeatureGateAttributes{
Name: FeatureGateSignatureStores,
},
OwningJiraComponent: "over-the-air-updates",
ResponsiblePerson: "lmohanty",
OwningProduct: ocpSpecific,
}
)
2 changes: 1 addition & 1 deletion config/v1/stable.clusterversion.testsuite.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: apiextensions.k8s.io/v1 # Hack because controller-gen complains if we don't have this
name: "[Stable] ClusterVersion"
crd: 0000_00_cluster-version-operator_01_clusterversion.crd.yaml
crd: 0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml
tests:
onCreate:
- name: Should be able to create a minimal ClusterVersion
Expand Down
Loading