Merge pull request openshift#4378 from a-dsouza/nodepool-cel-fix

OCPBUGS-36897: fix(api): Nodepool CEL validation fix
sdminonne · Jul 19, 2024 · c84168e · c84168e
2 parents 6e87ba0 + 2b77a81
commit c84168e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/api/hypershift/v1beta1/nodepool_types.go b/api/hypershift/v1beta1/nodepool_types.go
@@ -80,7 +80,7 @@ type NodePool struct {
 // NodePoolSpec is the desired behavior of a NodePool.
 // +kubebuilder:validation:XValidation:rule="!has(oldSelf.arch) || has(self.arch)", message="Arch is required once set"
 // +kubebuilder:validation:XValidation:rule="self.arch != 'arm64' || has(self.platform.aws)", message="Setting Arch to arm64 is only supported for AWS"
-// +kubebuilder:validation:XValidation:rule="has(self.replicas) ? !has(self.autoScaling) : has(self.autoScaling)", message="One of replicas or autoScaling should be set but not both"
+// +kubebuilder:validation:XValidation:rule="!has(self.replicas) || !has(self.autoScaling)", message="Both replicas or autoScaling should not be set"
 type NodePoolSpec struct {
 	// ClusterName is the name of the HostedCluster this NodePool belongs to.
 	//

diff --git a/cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml b/cmd/install/assets/hypershift-operator/hypershift.openshift.io_nodepools.yaml
@@ -2245,8 +2245,8 @@ spec:
               rule: '!has(oldSelf.arch) || has(self.arch)'
             - message: Setting Arch to arm64 is only supported for AWS
               rule: self.arch != 'arm64' || has(self.platform.aws)
-            - message: One of replicas or autoScaling should be set but not both
-              rule: 'has(self.replicas) ? !has(self.autoScaling) : has(self.autoScaling)'
+            - message: Both replicas or autoScaling should not be set
+              rule: '!has(self.replicas) || !has(self.autoScaling)'
           status:
             description: Status is the latest observed status of the NodePool.
             properties:

diff --git a/hack/app-sre/saas_template.yaml b/hack/app-sre/saas_template.yaml
@@ -68458,8 +68458,8 @@ objects:
                 rule: '!has(oldSelf.arch) || has(self.arch)'
               - message: Setting Arch to arm64 is only supported for AWS
                 rule: self.arch != 'arm64' || has(self.platform.aws)
-              - message: One of replicas or autoScaling should be set but not both
-                rule: 'has(self.replicas) ? !has(self.autoScaling) : has(self.autoScaling)'
+              - message: Both replicas or autoScaling should not be set
+                rule: '!has(self.replicas) || !has(self.autoScaling)'
             status:
               description: Status is the latest observed status of the NodePool.
               properties: