fix validation

Signed-off-by: Britania Rodriguez Reyes <[email protected]>

Author: britaniar

apis/placement/v1alpha1/override_types.go

@@ -91,8 +91,8 @@ type OverridePolicy struct {
 }
 
 // OverrideRule defines how to override the selected resources on the target clusters.
-// +kubebuilder:validation:XValidation:rule="!(has(self.overrideType) && self.overrideType == 'Delete' && self.jsonPatchOverrides.size() != 0)", message="jsonPatchOverrides cannot be set when the override type is Delete."
-// +kubebuilder:validation:XValidation:rule="!(has(self.overrideType) && self.overrideType == 'JSONPatch' && self.jsonPatchOverrides.size() == 0)", message="jsonPatchOverrides must be set when the override type is JSONPatch."
+// +kubebuilder:validation:XValidation:rule="!(self.overrideType == 'Delete' && has(self.jsonPatchOverrides) && self.jsonPatchOverrides.size() > 0)", message="jsonPatchOverrides cannot be set when the override type is Delete."
+// +kubebuilder:validation:XValidation:rule="!(self.overrideType == 'JSONPatch' && !has(self.jsonPatchOverrides) && self.jsonPatchOverrides.size() == 0)", message="jsonPatchOverrides must be set when the override type is JSONPatch."
 type OverrideRule struct {
 	// ClusterSelectors selects the target clusters.
 	// The resources will be overridden before applying to the matching clusters.

config/crd/bases/placement.kubernetes-fleet.io_clusterresourceoverrides.yaml

@@ -365,11 +365,11 @@ spec:
                       x-kubernetes-validations:
                       - message: jsonPatchOverrides cannot be set when the override
                           type is Delete.
-                        rule: '!(has(self.overrideType) && self.overrideType == ''Delete''
-                          && self.jsonPatchOverrides.size() != 0)'
+                        rule: '!(self.overrideType == ''Delete'' && has(self.jsonPatchOverrides)
+                          && self.jsonPatchOverrides.size() > 0)'
                       - message: jsonPatchOverrides must be set when the override
                           type is JSONPatch.
-                        rule: '!(has(self.overrideType) && self.overrideType == ''JSONPatch''
+                        rule: '!(self.overrideType == ''JSONPatch'' && !has(self.jsonPatchOverrides)
                           && self.jsonPatchOverrides.size() == 0)'
                     maxItems: 20
                     minItems: 1

config/crd/bases/placement.kubernetes-fleet.io_clusterresourceoverridesnapshots.yaml

@@ -379,12 +379,12 @@ spec:
                           x-kubernetes-validations:
                           - message: jsonPatchOverrides cannot be set when the override
                               type is Delete.
-                            rule: '!(has(self.overrideType) && self.overrideType ==
-                              ''Delete'' && self.jsonPatchOverrides.size() != 0)'
+                            rule: '!(self.overrideType == ''Delete'' && has(self.jsonPatchOverrides)
+                              && self.jsonPatchOverrides.size() > 0)'
                           - message: jsonPatchOverrides must be set when the override
                               type is JSONPatch.
-                            rule: '!(has(self.overrideType) && self.overrideType ==
-                              ''JSONPatch'' && self.jsonPatchOverrides.size() == 0)'
+                            rule: '!(self.overrideType == ''JSONPatch'' && !has(self.jsonPatchOverrides)
+                              && self.jsonPatchOverrides.size() == 0)'
                         maxItems: 20
                         minItems: 1
                         type: array

config/crd/bases/placement.kubernetes-fleet.io_resourceoverrides.yaml

@@ -281,11 +281,11 @@ spec:
                       x-kubernetes-validations:
                       - message: jsonPatchOverrides cannot be set when the override
                           type is Delete.
-                        rule: '!(has(self.overrideType) && self.overrideType == ''Delete''
-                          && self.jsonPatchOverrides.size() != 0)'
+                        rule: '!(self.overrideType == ''Delete'' && has(self.jsonPatchOverrides)
+                          && self.jsonPatchOverrides.size() > 0)'
                       - message: jsonPatchOverrides must be set when the override
                           type is JSONPatch.
-                        rule: '!(has(self.overrideType) && self.overrideType == ''JSONPatch''
+                        rule: '!(self.overrideType == ''JSONPatch'' && !has(self.jsonPatchOverrides)
                           && self.jsonPatchOverrides.size() == 0)'
                     maxItems: 20
                     minItems: 1

config/crd/bases/placement.kubernetes-fleet.io_resourceoverridesnapshots.yaml

@@ -295,12 +295,12 @@ spec:
                           x-kubernetes-validations:
                           - message: jsonPatchOverrides cannot be set when the override
                               type is Delete.
-                            rule: '!(has(self.overrideType) && self.overrideType ==
-                              ''Delete'' && self.jsonPatchOverrides.size() != 0)'
+                            rule: '!(self.overrideType == ''Delete'' && has(self.jsonPatchOverrides)
+                              && self.jsonPatchOverrides.size() > 0)'
                           - message: jsonPatchOverrides must be set when the override
                               type is JSONPatch.
-                            rule: '!(has(self.overrideType) && self.overrideType ==
-                              ''JSONPatch'' && self.jsonPatchOverrides.size() == 0)'
+                            rule: '!(self.overrideType == ''JSONPatch'' && !has(self.jsonPatchOverrides)
+                              && self.jsonPatchOverrides.size() == 0)'
                         maxItems: 20
                         minItems: 1
                         type: array