Skip to content

OPRUN-3588: Add OperatorLifecycleManagerV1 cluster version capability #2066

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

Merged
openshift-merge-bot merged 1 commit into from
Nov 8, 2024
Merged

OPRUN-3588: Add OperatorLifecycleManagerV1 cluster version capability #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 40 additions & 0 deletions config/v1/tests/clusterversions.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,46 @@ tests:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- baremetal
- name: Should be able to create a ClusterVersion with base capability None, and additional capability OperatorLifecycleManagerV1
initial: |
apiVersion: config.openshift.io/v1
kind: ClusterVersion
spec:
clusterID: foo
capabilities:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- OperatorLifecycleManagerV1
expected: |
apiVersion: config.openshift.io/v1
kind: ClusterVersion
spec:
clusterID: foo
capabilities:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- OperatorLifecycleManagerV1
- name: Should be able to create a ClusterVersion with base capability None, and additional capabilities OperatorLifecycleManager and OperatorLifecycleManagerV1
initial: |
apiVersion: config.openshift.io/v1
kind: ClusterVersion
spec:
clusterID: foo
capabilities:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- OperatorLifecycleManager
- OperatorLifecycleManagerV1
expected: |
apiVersion: config.openshift.io/v1
kind: ClusterVersion
spec:
clusterID: foo
capabilities:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- OperatorLifecycleManager
- OperatorLifecycleManagerV1
- name: Should be able to create a ClusterVersion with base capability None, and additional capabilities marketplace and OperatorLifecycleManager
initial: |
apiVersion: config.openshift.io/v1
Expand Down
40 changes: 40 additions & 0 deletions config/v1/tests/clusterversions.config.openshift.io/SignatureStores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,46 @@ tests:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- baremetal
- name: Should be able to create a ClusterVersion with base capability None, and additional capability OperatorLifecycleManagerV1
initial: |
apiVersion: config.openshift.io/v1
kind: ClusterVersion
spec:
clusterID: foo
capabilities:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- OperatorLifecycleManagerV1
expected: |
apiVersion: config.openshift.io/v1
kind: ClusterVersion
spec:
clusterID: foo
capabilities:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- OperatorLifecycleManagerV1
- name: Should be able to create a ClusterVersion with base capability None, and additional capabilities OperatorLifecycleManager and OperatorLifecycleManagerV1
initial: |
apiVersion: config.openshift.io/v1
kind: ClusterVersion
spec:
clusterID: foo
capabilities:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- OperatorLifecycleManager
- OperatorLifecycleManagerV1
expected: |
apiVersion: config.openshift.io/v1
kind: ClusterVersion
spec:
clusterID: foo
capabilities:
baselineCapabilitySet: None
additionalEnabledCapabilities:
- OperatorLifecycleManager
- OperatorLifecycleManagerV1
- name: Should be able to create a ClusterVersion with base capability None, and additional capabilities marketplace and OperatorLifecycleManager
initial: |
apiVersion: config.openshift.io/v1
Expand Down
11 changes: 9 additions & 2 deletions config/v1/types_cluster_version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ const (
)

// ClusterVersionCapability enumerates optional, core cluster components.
// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager;CloudCredential;Ingress;CloudControllerManager
// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager;CloudCredential;Ingress;CloudControllerManager;OperatorLifecycleManagerV1
type ClusterVersionCapability string

const (
Expand Down Expand Up @@ -379,10 +379,14 @@ const (
// allows to distribute Docker images
ClusterVersionCapabilityImageRegistry ClusterVersionCapability = "ImageRegistry"

// ClusterVersionCapabilityOperatorLifecycleManager manages the Operator Lifecycle Manager
// ClusterVersionCapabilityOperatorLifecycleManager manages the Operator Lifecycle Manager (legacy)
// which itself manages the lifecycle of operators
ClusterVersionCapabilityOperatorLifecycleManager ClusterVersionCapability = "OperatorLifecycleManager"

// ClusterVersionCapabilityOperatorLifecycleManagerV1 manages the Operator Lifecycle Manager (v1)
// which itself manages the lifecycle of operators
ClusterVersionCapabilityOperatorLifecycleManagerV1 ClusterVersionCapability = "OperatorLifecycleManagerV1"

// ClusterVersionCapabilityCloudCredential manages credentials for cloud providers
// in openshift cluster
ClusterVersionCapabilityCloudCredential ClusterVersionCapability = "CloudCredential"
Expand Down Expand Up @@ -422,6 +426,7 @@ var KnownClusterVersionCapabilities = []ClusterVersionCapability{
ClusterVersionCapabilityDeploymentConfig,
ClusterVersionCapabilityImageRegistry,
ClusterVersionCapabilityOperatorLifecycleManager,
ClusterVersionCapabilityOperatorLifecycleManagerV1,
ClusterVersionCapabilityCloudCredential,
ClusterVersionCapabilityIngress,
ClusterVersionCapabilityCloudControllerManager,
Expand Down Expand Up @@ -600,6 +605,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers
ClusterVersionCapabilityDeploymentConfig,
ClusterVersionCapabilityImageRegistry,
ClusterVersionCapabilityOperatorLifecycleManager,
ClusterVersionCapabilityOperatorLifecycleManagerV1,
ClusterVersionCapabilityCloudCredential,
ClusterVersionCapabilityIngress,
ClusterVersionCapabilityCloudControllerManager,
Expand All @@ -618,6 +624,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers
ClusterVersionCapabilityDeploymentConfig,
ClusterVersionCapabilityImageRegistry,
ClusterVersionCapabilityOperatorLifecycleManager,
ClusterVersionCapabilityOperatorLifecycleManagerV1,
ClusterVersionCapabilityCloudCredential,
ClusterVersionCapabilityIngress,
ClusterVersionCapabilityCloudControllerManager,
Expand Down
3 changes: 3 additions & 0 deletions ...rd-manifests/0000_00_cluster-version-operator_01_clusterversions-CustomNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -378,6 +379,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -404,6 +406,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 3 additions & 0 deletions ...erated.crd-manifests/0000_00_cluster-version-operator_01_clusterversions-Default.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -327,6 +328,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -353,6 +355,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 3 additions & 0 deletions ...anifests/0000_00_cluster-version-operator_01_clusterversions-DevPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -378,6 +379,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -404,6 +406,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 3 additions & 0 deletions ...nifests/0000_00_cluster-version-operator_01_clusterversions-TechPreviewNoUpgrade.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -378,6 +379,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -404,6 +406,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 3 additions & 0 deletions ...generated.featuregated-crd-manifests/clusterversions.config.openshift.io/AAA_ungated.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -329,6 +330,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -355,6 +357,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down
3 changes: 3 additions & 0 deletions ...rated.featuregated-crd-manifests/clusterversions.config.openshift.io/SignatureStores.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down Expand Up @@ -380,6 +381,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand All @@ -406,6 +408,7 @@ spec:
- CloudCredential
- Ingress
- CloudControllerManager
- OperatorLifecycleManagerV1
type: string
type: array
x-kubernetes-list-type: atomic
Expand Down