address comments

apis/placement/v1alpha1/override_types.go

@@ -14,6 +14,7 @@ import (
 
 // +genclient
 // +genclient:nonNamespaced
+// +kubebuilder:storageversion
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope="Cluster",categories={fleet,fleet-placement}
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -34,6 +35,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 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"`
+
 	// 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 +56,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.
@@ -117,6 +118,7 @@ const (
 
 // +genclient
 // +genclient:Namespaced
+// +kubebuilder:storageversion
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope="Namespaced",categories={fleet,fleet-placement}
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -137,6 +139,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 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"`
+
 	// 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 +157,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.

apis/placement/v1alpha1/overridesnapshot_types.go

@@ -25,6 +25,7 @@ const (
 
 // +genclient
 // +genclient:nonNamespaced
+// +kubebuilder:storageversion
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope="Cluster",categories={fleet,fleet-placement}
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
@@ -60,6 +61,7 @@ type ClusterResourceOverrideSnapshotSpec struct {
 
 // +genclient
 // +genclient:Namespaced
+// +kubebuilder:storageversion
 // +kubebuilder:object:root=true
 // +kubebuilder:resource:scope="Namespaced",categories={fleet,fleet-placement}
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object