update CEL to be more accurate

openshift · Jun 12, 2023 · db0028c · db0028c
1 parent 99f7e5b
commit db0028c
Show file tree

Hide file tree

Showing 8 changed files with 364 additions and 31 deletions.
diff --git a/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml b/config/v1/0000_10_config-operator_01_infrastructure-Default.crd.yaml
@@ -593,9 +593,6 @@ spec:
                     external:
                       description: External contains settings specific to the generic External infrastructure provider.
                       type: object
-                      x-kubernetes-validations:
-                        - message: cloudControllerManager added or removed once set
-                          rule: has(self.cloudControllerManager) == has(oldSelf.cloudControllerManager)
                     gcp:
                       description: GCP contains settings specific to the Google Cloud Platform infrastructure provider.
                       properties:

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
@@ -617,10 +617,10 @@ spec:
                       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)
+                          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 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."
+                              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
@@ -631,12 +631,9 @@ spec:
                                   rule: self == oldSelf
                           type: object
                           x-kubernetes-validations:
-                            - message: state cannot be added or removed once set
-                              rule: has(self.state) == has(oldSelf.state)
+                            - 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
-                      x-kubernetes-validations:
-                        - message: cloudControllerManager added or removed once set
-                          rule: has(self.cloudControllerManager) == has(oldSelf.cloudControllerManager)
                     gcp:
                       description: GCP contains settings specific to the Google Cloud Platform infrastructure provider.
                       properties:

diff --git a/config/v1/feature_gates.go b/config/v1/feature_gates.go
@@ -89,7 +89,7 @@ var (
 			Name: FeatureGateExternalCloudProviderExternal,
 		},
 		OwningJiraComponent: "cloud-provider",
-		ResponsiblePerson:   "jspeed",
+		ResponsiblePerson:   "elmiko",
 		OwningProduct:       ocpSpecific,
 	}