Merge pull request #1434 from adriengentil/platform-external

OCPCLOUD-2010: Add CloudControllerManagerStatus to External platform status
openshift · Jun 13, 2023 · ba04973 · ba04973
2 parents 351f244 + db0028c
commit ba04973
Show file tree

Hide file tree

Showing 9 changed files with 601 additions and 3 deletions.
diff --git a/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml b/config/v1/0000_10_config-operator_01_infrastructure-TechPreviewNoUpgrade.crd.yaml
@@ -615,6 +615,24 @@ spec:
                       type: object
                     external:
                       description: External contains settings specific to the generic External infrastructure provider.
+                      properties:
+                        cloudControllerManager:
+                          description: cloudControllerManager contains settings specific to the external Cloud Controller Manager (a.k.a. CCM or CPI). When omitted, new nodes will be not tainted and no extra initialization from the cloud controller manager is expected.
+                          properties:
+                            state:
+                              description: "state determines whether or not an external Cloud Controller Manager is expected to be installed within the cluster. https://kubernetes.io/docs/tasks/administer-cluster/running-cloud-controller/#running-cloud-controller-manager \n Valid values are \"External\", \"None\" and omitted. When set to \"External\", new nodes will be tainted as uninitialized when created, preventing them from running workloads until they are initialized by the cloud controller manager. When omitted or set to \"None\", new nodes will be not tainted and no extra initialization from the cloud controller manager is expected."
+                              enum:
+                                - ""
+                                - External
+                                - None
+                              type: string
+                              x-kubernetes-validations:
+                                - message: state is immutable once set
+                                  rule: self == oldSelf
+                          type: object
+                          x-kubernetes-validations:
+                            - message: state may not be added or removed once set
+                              rule: (has(self.state) == has(oldSelf.state)) || (!has(oldSelf.state) && self.state != "External")
                       type: object
                     gcp:
                       description: GCP contains settings specific to the Google Cloud Platform infrastructure provider.

diff --git a/config/v1/feature_gates.go b/config/v1/feature_gates.go
@@ -83,6 +83,16 @@ var (
 		OwningProduct:       ocpSpecific,
 	}
 
+	FeatureGateExternalCloudProviderExternal = FeatureGateName("ExternalCloudProviderExternal")
+	externalCloudProviderExternal            = FeatureGateDescription{
+		FeatureGateAttributes: FeatureGateAttributes{
+			Name: FeatureGateExternalCloudProviderExternal,
+		},
+		OwningJiraComponent: "cloud-provider",
+		ResponsiblePerson:   "elmiko",
+		OwningProduct:       ocpSpecific,
+	}
+
 	FeatureGateCSIDriverSharedResource = FeatureGateName("CSIDriverSharedResource")
 	csiDriverSharedResource            = FeatureGateDescription{
 		FeatureGateAttributes: FeatureGateAttributes{