fix validation

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

Author: britaniar

apis/placement/v1alpha1/override_types.go

@@ -201,7 +201,7 @@ type JSONPatchOverride struct {
 	// Note: override will fail if the resource path does not exist.
 	// +required
 	// +kubebuilder:validation:XValidation:rule="!(self == '/kind' || self == '/apiVersion')",message="Path cannot target typeMeta fields (kind, apiVersion)"
-	// +kubebuilder:validation:XValidation:rule="!(self.startsWith('/metadata') && !(self.startsWith('/metadata/annotations') && self.startsWith('/metadata/labels')))",message="Path can only target annotations and labels under metadata"
+	// +kubebuilder:validation:XValidation:rule="!(self.startsWith('/metadata') && !(self.startsWith('/metadata/annotations') || self.startsWith('/metadata/labels')))",message="Path can only target annotations and labels under metadata"
 	// +kubebuilder:validation:XValidation:rule="!self.startsWith('/status')",message="Path cannot target status fields"
 	Path string `json:"path"`
 	// Value defines the content to be applied on the target location.

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

@@ -334,7 +334,7 @@ spec:
                                 - message: Path can only target annotations and labels
                                     under metadata
                                   rule: '!(self.startsWith(''/metadata'') && !(self.startsWith(''/metadata/annotations'')
-                                    && self.startsWith(''/metadata/labels'')))'
+                                    || self.startsWith(''/metadata/labels'')))'
                                 - message: Path cannot target status fields
                                   rule: '!self.startsWith(''/status'')'
                               value:

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

@@ -348,7 +348,7 @@ spec:
                                     - message: Path can only target annotations and
                                         labels under metadata
                                       rule: '!(self.startsWith(''/metadata'') && !(self.startsWith(''/metadata/annotations'')
-                                        && self.startsWith(''/metadata/labels'')))'
+                                        || self.startsWith(''/metadata/labels'')))'
                                     - message: Path cannot target status fields
                                       rule: '!self.startsWith(''/status'')'
                                   value:

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

@@ -250,7 +250,7 @@ spec:
                                 - message: Path can only target annotations and labels
                                     under metadata
                                   rule: '!(self.startsWith(''/metadata'') && !(self.startsWith(''/metadata/annotations'')
-                                    && self.startsWith(''/metadata/labels'')))'
+                                    || self.startsWith(''/metadata/labels'')))'
                                 - message: Path cannot target status fields
                                   rule: '!self.startsWith(''/status'')'
                               value:

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

@@ -264,7 +264,7 @@ spec:
                                     - message: Path can only target annotations and
                                         labels under metadata
                                       rule: '!(self.startsWith(''/metadata'') && !(self.startsWith(''/metadata/annotations'')
-                                        && self.startsWith(''/metadata/labels'')))'
+                                        || self.startsWith(''/metadata/labels'')))'
                                     - message: Path cannot target status fields
                                       rule: '!self.startsWith(''/status'')'
                                   value:

test/apis/placement/v1alpha1/api_validation_integration_test.go

@@ -431,4 +431,31 @@ var _ = Describe("Test placement v1alpha1 API validation", func() {
 			Expect(statusErr.Status().Message).Should(ContainSubstring("Path cannot target status fields"))
 		})
 	})
+
+	Context("Test ClusterResourceOverride API validation - valid cases", func() {
+		croName := fmt.Sprintf(croNameTemplate, GinkgoParallelProcess())
+		validClusterResourceSelector := placementv1beta1.ClusterResourceSelector{
+			Group:   "rbac.authorization.k8s.io",
+			Version: "v1",
+			Kind:    "ClusterRole",
+			Name:    "test-cluster-role",
+		}
+
+		It("Should allow creation of ClusterResourceOverride  with valid jsonPatchOverrides Paths (/metadata/labels)", func() {
+			cro := placementv1alpha1.ClusterResourceOverride{
+				ObjectMeta: metav1.ObjectMeta{
+					Name: croName,
+				},
+				Spec: placementv1alpha1.ClusterResourceOverrideSpec{
+					ClusterResourceSelectors: []placementv1beta1.ClusterResourceSelector{
+						validClusterResourceSelector,
+					},
+					Policy: policyWithInvalidOverrideRule,
+				},
+			}
+			// Modify the path to target 'metadata.name'
+			cro.Spec.Policy.OverrideRules[0].JSONPatchOverrides[0].Path = "/metadata/labels/label"
+			Expect(hubClient.Create(ctx, &cro)).Should(Succeed(), fmt.Sprintf("Create ClusterResourceOverride call produced error"))
+		})
+	})
 })