From 442d6ff696572ca00bc62b6754fbe7f6df54e9b8 Mon Sep 17 00:00:00 2001 From: qJkee Date: Tue, 5 Sep 2023 14:40:01 -0400 Subject: [PATCH] add CloudControllerManager capability --- ...operator_01_clusterversion-CustomNoUpgrade.crd.yaml | 3 +++ ...version-operator_01_clusterversion-Default.crd.yaml | 3 +++ ...tor_01_clusterversion-TechPreviewNoUpgrade.crd.yaml | 3 +++ config/v1/types_cluster_version.go | 10 +++++++++- 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion-CustomNoUpgrade.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion-CustomNoUpgrade.crd.yaml index 0f86e9694eb..dcb871eeed7 100644 --- a/config/v1/0000_00_cluster-version-operator_01_clusterversion-CustomNoUpgrade.crd.yaml +++ b/config/v1/0000_00_cluster-version-operator_01_clusterversion-CustomNoUpgrade.crd.yaml @@ -83,6 +83,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic @@ -351,6 +352,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic @@ -376,6 +378,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml index 1b52eb8d9b4..371177aafab 100644 --- a/config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml +++ b/config/v1/0000_00_cluster-version-operator_01_clusterversion-Default.crd.yaml @@ -83,6 +83,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic @@ -298,6 +299,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic @@ -323,6 +325,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic diff --git a/config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml b/config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml index ff17e6d065d..fcaf456a21f 100644 --- a/config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml +++ b/config/v1/0000_00_cluster-version-operator_01_clusterversion-TechPreviewNoUpgrade.crd.yaml @@ -83,6 +83,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic @@ -351,6 +352,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic @@ -376,6 +378,7 @@ spec: - OperatorLifecycleManager - CloudCredential - Ingress + - CloudControllerManager type: string type: array x-kubernetes-list-type: atomic diff --git a/config/v1/types_cluster_version.go b/config/v1/types_cluster_version.go index 85a39329381..dc913b75c07 100644 --- a/config/v1/types_cluster_version.go +++ b/config/v1/types_cluster_version.go @@ -278,7 +278,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 +// +kubebuilder:validation:Enum=openshift-samples;baremetal;marketplace;Console;Insights;Storage;CSISnapshot;NodeTuning;MachineAPI;Build;DeploymentConfig;ImageRegistry;OperatorLifecycleManager;CloudCredential;Ingress;CloudControllerManager type ClusterVersionCapability string const ( @@ -390,6 +390,11 @@ const ( // // WARNING: This capability cannot be disabled on the standalone OpenShift. ClusterVersionCapabilityIngress ClusterVersionCapability = "Ingress" + + // ClusterVersionCapabilityCloudControllerManager manages various Cloud Controller + // Managers deployed on top of OpenShift. They help you to work with cloud + // provider API and embeds cloud-specific control logic. + ClusterVersionCapabilityCloudControllerManager ClusterVersionCapability = "CloudControllerManager" ) // KnownClusterVersionCapabilities includes all known optional, core cluster components. @@ -409,6 +414,7 @@ var KnownClusterVersionCapabilities = []ClusterVersionCapability{ ClusterVersionCapabilityOperatorLifecycleManager, ClusterVersionCapabilityCloudCredential, ClusterVersionCapabilityIngress, + ClusterVersionCapabilityCloudControllerManager, } // ClusterVersionCapabilitySet defines sets of cluster version capabilities. @@ -538,6 +544,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers ClusterVersionCapabilityOperatorLifecycleManager, ClusterVersionCapabilityCloudCredential, ClusterVersionCapabilityIngress, + ClusterVersionCapabilityCloudControllerManager, }, ClusterVersionCapabilitySetCurrent: { ClusterVersionCapabilityBaremetal, @@ -555,6 +562,7 @@ var ClusterVersionCapabilitySets = map[ClusterVersionCapabilitySet][]ClusterVers ClusterVersionCapabilityOperatorLifecycleManager, ClusterVersionCapabilityCloudCredential, ClusterVersionCapabilityIngress, + ClusterVersionCapabilityCloudControllerManager, }, }