small fix

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

Author: britaniar

apis/placement/v1alpha1/override_types.go

@@ -203,7 +203,6 @@ type JSONPatchOverride struct {
 	// +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'))) || self == '/metadata')",message="Path can only target annotations and labels under metadata"
 	// +kubebuilder:validation:XValidation:rule="!self.startsWith('/status')",message="Path cannot target status fields"
-	// +kubebuilder:validation:XValidation:rule="self.startsWith('/')",message="Path must start with /"
 	Path string `json:"path"`
 	// Value defines the content to be applied on the target location.
 	// Value should be empty when operator is `remove`.

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

@@ -338,8 +338,6 @@ spec:
                                     self == ''/metadata'')'
                                 - message: Path cannot target status fields
                                   rule: '!self.startsWith(''/status'')'
-                                - message: Path must start with /
-                                  rule: self.startsWith('/')
                               value:
                                 description: |-
                                   Value defines the content to be applied on the target location.

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

@@ -352,8 +352,6 @@ spec:
                                         || self == ''/metadata'')'
                                     - message: Path cannot target status fields
                                       rule: '!self.startsWith(''/status'')'
-                                    - message: Path must start with /
-                                      rule: self.startsWith('/')
                                   value:
                                     description: |-
                                       Value defines the content to be applied on the target location.

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

@@ -40,6 +40,8 @@ spec:
           Each snapshot MUST have the following labels:
             - `CRPTrackingLabel` which points to its owner CRP.
             - `ResourceIndexLabel` which is the index  of the snapshot group.
+
+          The first snapshot of the index group MAY have the following labels:
             - `IsLatestSnapshotLabel` which indicates whether the snapshot is the latest one.
 
           All the snapshots within the same index group must have the same ResourceIndexLabel.
@@ -50,6 +52,9 @@ spec:
 
           Each snapshot (excluding the first snapshot) MUST have the following annotations:
             - `SubindexOfResourceSnapshotAnnotation` to store the subindex of resource snapshot in the group.
+
+          Snapshot may have the following annotations to indicate the time of next resourceSnapshot candidate detected by the controller:
+            - `NextResourceSnapshotCandidateDetectionTimeAnnotation` to store the time of next resourceSnapshot candidate detected by the controller.
         properties:
           apiVersion:
             description: |-
@@ -186,6 +191,9 @@ spec:
 
           Each snapshot (excluding the first snapshot) MUST have the following annotations:
             - `SubindexOfResourceSnapshotAnnotation` to store the subindex of resource snapshot in the group.
+
+          Snapshot may have the following annotations to indicate the time of next resourceSnapshot candidate detected by the controller:
+            - `NextResourceSnapshotCandidateDetectionTimeAnnotation` to store the time of next resourceSnapshot candidate detected by the controller.
         properties:
           apiVersion:
             description: |-

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

@@ -254,8 +254,6 @@ spec:
                                     self == ''/metadata'')'
                                 - message: Path cannot target status fields
                                   rule: '!self.startsWith(''/status'')'
-                                - message: Path must start with /
-                                  rule: self.startsWith('/')
                               value:
                                 description: |-
                                   Value defines the content to be applied on the target location.

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

@@ -268,8 +268,6 @@ spec:
                                         || self == ''/metadata'')'
                                     - message: Path cannot target status fields
                                       rule: '!self.startsWith(''/status'')'
-                                    - message: Path must start with /
-                                      rule: self.startsWith('/')
                                   value:
                                     description: |-
                                       Value defines the content to be applied on the target location.

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

@@ -40,6 +40,8 @@ spec:
           Each snapshot MUST have the following labels:
             - `CRPTrackingLabel` which points to its owner resource placement.
             - `ResourceIndexLabel` which is the index  of the snapshot group.
+
+          The first snapshot of the index group MAY have the following labels:
             - `IsLatestSnapshotLabel` which indicates whether the snapshot is the latest one.
 
           All the snapshots within the same index group must have the same ResourceIndexLabel.

test/apis/placement/v1alpha1/api_validation_integration_test.go

@@ -135,70 +135,6 @@ var _ = Describe("Test placement v1alpha1 API validation", func() {
 			Expect(statusErr.Status().Message).Should(MatchRegexp("jsonPatchOverrides must be set when the override type is JSONPatch."))
 		})
 
-		It("Should deny creation of ClusterResourceOverride with Path not starting with /", func() {
-			cro := placementv1alpha1.ClusterResourceOverride{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: croName,
-				},
-				Spec: placementv1alpha1.ClusterResourceOverrideSpec{
-					ClusterResourceSelectors: []placementv1beta1.ClusterResourceSelector{
-						validClusterResourceSelector,
-					},
-					Policy: &placementv1alpha1.OverridePolicy{
-						OverrideRules: []placementv1alpha1.OverrideRule{
-							{
-								OverrideType:    placementv1alpha1.JSONPatchOverrideType,
-								ClusterSelector: validClusterSelector,
-								JSONPatchOverrides: []placementv1alpha1.JSONPatchOverride{
-									{
-										Operator: placementv1alpha1.JSONPatchOverrideOpAdd,
-										Path:     "metadata/labels//old-label",
-										Value:    apiextensionsv1.JSON{Raw: []byte(`"old-value"`)},
-									},
-								},
-							},
-						},
-					},
-				},
-			}
-			err := hubClient.Create(ctx, &cro)
-			var statusErr *k8sErrors.StatusError
-			Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Create ClusterResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
-			Expect(statusErr.Status().Message).Should(MatchRegexp("Path must start with /"))
-		})
-
-		It("Should deny creation of ClusterResourceOverride with empty segments in Path", func() {
-			cro := placementv1alpha1.ClusterResourceOverride{
-				ObjectMeta: metav1.ObjectMeta{
-					Name: croName,
-				},
-				Spec: placementv1alpha1.ClusterResourceOverrideSpec{
-					ClusterResourceSelectors: []placementv1beta1.ClusterResourceSelector{
-						validClusterResourceSelector,
-					},
-					Policy: &placementv1alpha1.OverridePolicy{
-						OverrideRules: []placementv1alpha1.OverrideRule{
-							{
-								OverrideType:    placementv1alpha1.JSONPatchOverrideType,
-								ClusterSelector: validClusterSelector,
-								JSONPatchOverrides: []placementv1alpha1.JSONPatchOverride{
-									{
-										Operator: placementv1alpha1.JSONPatchOverrideOpAdd,
-										Path:     "/metadata/labels//old-label",
-										Value:    apiextensionsv1.JSON{Raw: []byte(`"old-value"`)}, // This should not be set for remove operator
-									},
-								},
-							},
-						},
-					},
-				},
-			}
-			err := hubClient.Create(ctx, &cro)
-			var statusErr *k8sErrors.StatusError
-			Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Create ClusterResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
-			Expect(statusErr.Status().Message).Should(MatchRegexp("Value must be empty when operator is remove"))
-		})
-
 		It("Should deny creation of ClusterResourceOverride with invalid jsonPatchOverrides Paths (/apiVersion)", func() {
 			cro := placementv1alpha1.ClusterResourceOverride{
 				ObjectMeta: metav1.ObjectMeta{
@@ -647,38 +583,5 @@ var _ = Describe("Test placement v1alpha1 API validation", func() {
 			Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Create Override call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
 			Expect(statusErr.Status().Message).Should(ContainSubstring("Path cannot contain empty or whitespace-only segments"))
 		})
-
-		It("Should deny creation of ResourceOverride with Path not starting with /", func() {
-			ro := placementv1alpha1.ResourceOverride{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      roName,
-					Namespace: "test-namespace",
-				},
-				Spec: placementv1alpha1.ResourceOverrideSpec{
-					ResourceSelectors: []placementv1alpha1.ResourceSelector{
-						validResourceSelector,
-					},
-					Policy: &placementv1alpha1.OverridePolicy{
-						OverrideRules: []placementv1alpha1.OverrideRule{
-							{
-								OverrideType:    placementv1alpha1.JSONPatchOverrideType,
-								ClusterSelector: validClusterSelector,
-								JSONPatchOverrides: []placementv1alpha1.JSONPatchOverride{
-									{
-										Operator: placementv1alpha1.JSONPatchOverrideOpAdd,
-										Path:     "metadata/labels//old-label",
-										Value:    apiextensionsv1.JSON{Raw: []byte(`"old-value"`)},
-									},
-								},
-							},
-						},
-					},
-				},
-			}
-			err := hubClient.Create(ctx, &ro)
-			var statusErr *k8sErrors.StatusError
-			Expect(errors.As(err, &statusErr)).To(BeTrue(), fmt.Sprintf("Create ResourceOverride call produced error %s. Error type wanted is %s.", reflect.TypeOf(err), reflect.TypeOf(&k8sErrors.StatusError{})))
-			Expect(statusErr.Status().Message).Should(MatchRegexp("Path must start with /"))
-		})
 	})
 })