address comments

apis/placement/v1alpha1/override_types.go

@@ -34,6 +34,13 @@ type ClusterResourceOverride struct {
 // If the resource is selected by both ClusterResourceOverride and ResourceOverride, ResourceOverride will win when resolving
 // conflicts.
 type ClusterResourceOverrideSpec struct {
+	// Placement defines whether the override is applied to a specific placement or not.
+	// If set, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
+	// Otherwise, it will be applied to the next rollout.
+	// The recommended way is to set the placement so that the override can be rolled out immediately.
+	// +optional
+	Placement *PlacementRef `json:"placement,omitempty"`
+
 	// ClusterResourceSelectors is an array of selectors used to select cluster scoped resources. The selectors are `ORed`.
 	// If a namespace is selected, ALL the resources under the namespace are selected automatically.
 	// LabelSelector is not supported.
@@ -48,13 +55,6 @@ type ClusterResourceOverrideSpec struct {
 	// Policy defines how to override the selected resources on the target clusters.
 	// +required
 	Policy *OverridePolicy `json:"policy"`
-
-	// Placement defines whether the override is applied to a specific placement or not.
-	// If so, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
-	// Otherwise, it will be applied to the next rollout.
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="spec.placement is immutable"
-	// +optional
-	Placement *PlacementRef `json:"placement,omitempty"`
 }
 
 // PlacementRef is the reference to a placement.
@@ -137,6 +137,13 @@ type ResourceOverride struct {
 // If the resource is selected by both ClusterResourceOverride and ResourceOverride, ResourceOverride will win when resolving
 // conflicts.
 type ResourceOverrideSpec struct {
+	// Placement defines whether the override is applied to a specific placement or not.
+	// If set, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
+	// Otherwise, it will be applied to the next rollout.
+	// The recommended way is to set the placement so that the override can be rolled out immediately.
+	// +optional
+	Placement *PlacementRef `json:"placement,omitempty"`
+
 	// ResourceSelectors is an array of selectors used to select namespace scoped resources. The selectors are `ORed`.
 	// You can have 1-20 selectors.
 	// +kubebuilder:validation:Required
@@ -148,13 +155,6 @@ type ResourceOverrideSpec struct {
 	// Policy defines how to override the selected resources on the target clusters.
 	// +required
 	Policy *OverridePolicy `json:"policy"`
-
-	// Placement defines whether the override is applied to a specific placement or not.
-	// If so, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
-	// Otherwise, it will be applied to the next rollout.
-	// +kubebuilder:validation:XValidation:rule="self == oldSelf",message="spec.placement is immutable"
-	// +optional
-	Placement *PlacementRef `json:"placement,omitempty"`
 }
 
 // ResourceSelector is used to select namespace scoped resources as the target resources to be placed.

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

@@ -132,18 +132,16 @@ spec:
               placement:
                 description: |-
                   Placement defines whether the override is applied to a specific placement or not.
-                  If so, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
+                  If set, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
                   Otherwise, it will be applied to the next rollout.
+                  The recommended way is to set the placement so that the override can be rolled out immediately.
                 properties:
                   name:
                     description: Name is the reference to the name of placement.
                     type: string
                 required:
                 - name
                 type: object
-                x-kubernetes-validations:
-                - message: spec.placement is immutable
-                  rule: self == oldSelf
               policy:
                 description: Policy defines how to override the selected resources
                   on the target clusters.

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

@@ -146,18 +146,16 @@ spec:
                   placement:
                     description: |-
                       Placement defines whether the override is applied to a specific placement or not.
-                      If so, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
+                      If set, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
                       Otherwise, it will be applied to the next rollout.
+                      The recommended way is to set the placement so that the override can be rolled out immediately.
                     properties:
                       name:
                         description: Name is the reference to the name of placement.
                         type: string
                     required:
                     - name
                     type: object
-                    x-kubernetes-validations:
-                    - message: spec.placement is immutable
-                      rule: self == oldSelf
                   policy:
                     description: Policy defines how to override the selected resources
                       on the target clusters.

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

@@ -47,18 +47,16 @@ spec:
               placement:
                 description: |-
                   Placement defines whether the override is applied to a specific placement or not.
-                  If so, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
+                  If set, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
                   Otherwise, it will be applied to the next rollout.
+                  The recommended way is to set the placement so that the override can be rolled out immediately.
                 properties:
                   name:
                     description: Name is the reference to the name of placement.
                     type: string
                 required:
                 - name
                 type: object
-                x-kubernetes-validations:
-                - message: spec.placement is immutable
-                  rule: self == oldSelf
               policy:
                 description: Policy defines how to override the selected resources
                   on the target clusters.
@@ -266,10 +264,7 @@ spec:
                           minItems: 1
                           type: array
                         overrideType:
-<<<<<<< HEAD
                           default: JSONPatch
-=======
->>>>>>> 683fa05 (interface: support crp attached override)
                           description: OverrideType defines the type of the override
                             rules.
                           enum:

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

@@ -61,18 +61,16 @@ spec:
                   placement:
                     description: |-
                       Placement defines whether the override is applied to a specific placement or not.
-                      If so, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
+                      If set, the override will trigger the placement rollout immediately when the rollout strategy type is RollingUpdate.
                       Otherwise, it will be applied to the next rollout.
+                      The recommended way is to set the placement so that the override can be rolled out immediately.
                     properties:
                       name:
                         description: Name is the reference to the name of placement.
                         type: string
                     required:
                     - name
                     type: object
-                    x-kubernetes-validations:
-                    - message: spec.placement is immutable
-                      rule: self == oldSelf
                   policy:
                     description: Policy defines how to override the selected resources
                       on the target clusters.
@@ -280,10 +278,7 @@ spec:
                               minItems: 1
                               type: array
                             overrideType:
-<<<<<<< HEAD
                               default: JSONPatch
-=======
->>>>>>> 683fa05 (interface: support crp attached override)
                               description: OverrideType defines the type of the override
                                 rules.
                               enum: