Rename DeleteOptions to DeleteStrategy and move inside RolloutStrategy after ApplyStrategy

Copilot · circy9 · Copilot · commit 27771e4fc40d · 2025-07-17T22:44:50.000Z
Co-authored-by: circy9 &lt;13264318+circy9@users.noreply.github.com&gt;
diff --git a/apis/placement/v1beta1/clusterresourceplacement_types.go b/apis/placement/v1beta1/clusterresourceplacement_types.go
@@ -148,10 +148,6 @@ type PlacementSpec struct {
 	// +kubebuilder:default=10
 	// +kubebuilder:validation:Optional
 	RevisionHistoryLimit *int32 `json:"revisionHistoryLimit,omitempty"`
-
-	// DeleteOptions configures the deletion behavior when the ClusterResourcePlacement is deleted.
-	// +kubebuilder:validation:Optional
-	DeleteOptions *DeleteOptions `json:"deleteOptions,omitempty"`
 }
 
 // Tolerations returns tolerations for PlacementSpec to handle nil policy case.
@@ -492,6 +488,10 @@ type RolloutStrategy struct {
 	// ApplyStrategy describes when and how to apply the selected resources to the target cluster.
 	// +kubebuilder:validation:Optional
 	ApplyStrategy *ApplyStrategy `json:"applyStrategy,omitempty"`
+
+	// DeleteStrategy configures the deletion behavior when the ClusterResourcePlacement is deleted.
+	// +kubebuilder:validation:Optional
+	DeleteStrategy *DeleteStrategy `json:"deleteStrategy,omitempty"`
 }
 
 // ApplyStrategy describes when and how to apply the selected resource to the target cluster.
@@ -1323,8 +1323,8 @@ const (
 	PickFixedPlacementType PlacementType = "PickFixed"
 )
 
-// DeleteOptions configures the deletion behavior when a placement is deleted.
-type DeleteOptions struct {
+// DeleteStrategy configures the deletion behavior when a placement is deleted.
+type DeleteStrategy struct {
 	// PropagationPolicy controls how the deletion is propagated to placed resources.
 	// Defaults to "Abandon".
 	//
diff --git a/apis/placement/v1beta1/zz_generated.deepcopy.go b/apis/placement/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/placement.kubernetes-fleet.io_clusterresourcebindings.yaml b/config/crd/bases/placement.kubernetes-fleet.io_clusterresourcebindings.yaml
@@ -542,8 +542,8 @@ spec:
                         managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
                         option.
 
-                        Note that this option would revert any ad-hoc changes made on the member cluster side in
-                        the managed fields; if you would like to make temporary edits on the member cluster side
+                        Note that this option would revert any ad-hoc changes made on the member cluster side in the
+                        managed fields; if you would like to make temporary edits on the member cluster side
                         in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
                         fields will be left alone; if you use the FullDiff compare option, such changes will
                         be reported as drifts.
diff --git a/config/crd/bases/placement.kubernetes-fleet.io_clusterresourceplacements.yaml b/config/crd/bases/placement.kubernetes-fleet.io_clusterresourceplacements.yaml
@@ -1144,28 +1144,6 @@ spec:
           spec:
             description: The desired state of ClusterResourcePlacement.
             properties:
-              deleteOptions:
-                description: DeleteOptions configures the deletion behavior when the
-                  ClusterResourcePlacement is deleted.
-                properties:
-                  propagationPolicy:
-                    default: Abandon
-                    description: |-
-                      PropagationPolicy controls how the deletion is propagated to placed resources.
-                      Defaults to "Abandon".
-
-                      Available options:
-
-                      * Abandon: all placed resources on member clusters will be left intact (abandoned)
-                        when the ClusterResourcePlacement is deleted. This is the default behavior.
-
-                      * Delete: all placed resources on member clusters will be deleted when the
-                        ClusterResourcePlacement is deleted.
-                    enum:
-                    - Abandon
-                    - Delete
-                    type: string
-                type: object
               policy:
                 description: |-
                   Policy defines how to select member clusters to place the selected resources.
@@ -1829,8 +1807,8 @@ spec:
                             managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
                             option.
 
-                            Note that this option would revert any ad-hoc changes made on the member cluster side in
-                            the managed fields; if you would like to make temporary edits on the member cluster side
+                            Note that this option would revert any ad-hoc changes made on the member cluster side in the
+                            managed fields; if you would like to make temporary edits on the member cluster side
                             in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
                             fields will be left alone; if you use the FullDiff compare option, such changes will
                             be reported as drifts.
@@ -1927,6 +1905,28 @@ spec:
                         - Never
                         type: string
                     type: object
+                  deleteStrategy:
+                    description: DeleteStrategy configures the deletion behavior when
+                      the ClusterResourcePlacement is deleted.
+                    properties:
+                      propagationPolicy:
+                        default: Abandon
+                        description: |-
+                          PropagationPolicy controls how the deletion is propagated to placed resources.
+                          Defaults to "Abandon".
+
+                          Available options:
+
+                          * Abandon: all placed resources on member clusters will be left intact (abandoned)
+                            when the ClusterResourcePlacement is deleted. This is the default behavior.
+
+                          * Delete: all placed resources on member clusters will be deleted when the
+                            ClusterResourcePlacement is deleted.
+                        enum:
+                        - Abandon
+                        - Delete
+                        type: string
+                    type: object
                   rollingUpdate:
                     description: Rolling update config params. Present only if RolloutStrategyType
                       = RollingUpdate.
diff --git a/config/crd/bases/placement.kubernetes-fleet.io_clusterresourcesnapshots.yaml b/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: |-
diff --git a/config/crd/bases/placement.kubernetes-fleet.io_clusterstagedupdateruns.yaml b/config/crd/bases/placement.kubernetes-fleet.io_clusterstagedupdateruns.yaml
@@ -235,8 +235,8 @@ spec:
                         managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
                         option.
 
-                        Note that this option would revert any ad-hoc changes made on the member cluster side in
-                        the managed fields; if you would like to make temporary edits on the member cluster side
+                        Note that this option would revert any ad-hoc changes made on the member cluster side in the
+                        managed fields; if you would like to make temporary edits on the member cluster side
                         in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
                         fields will be left alone; if you use the FullDiff compare option, such changes will
                         be reported as drifts.
@@ -1315,8 +1315,8 @@ spec:
                         managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
                         option.
 
-                        Note that this option would revert any ad-hoc changes made on the member cluster side in
-                        the managed fields; if you would like to make temporary edits on the member cluster side
+                        Note that this option would revert any ad-hoc changes made on the member cluster side in the
+                        managed fields; if you would like to make temporary edits on the member cluster side
                         in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
                         fields will be left alone; if you use the FullDiff compare option, such changes will
                         be reported as drifts.
diff --git a/config/crd/bases/placement.kubernetes-fleet.io_resourcebindings.yaml b/config/crd/bases/placement.kubernetes-fleet.io_resourcebindings.yaml
@@ -190,8 +190,8 @@ spec:
                         managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
                         option.
 
-                        Note that this option would revert any ad-hoc changes made on the member cluster side in
-                        the managed fields; if you would like to make temporary edits on the member cluster side
+                        Note that this option would revert any ad-hoc changes made on the member cluster side in the
+                        managed fields; if you would like to make temporary edits on the member cluster side
                         in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
                         fields will be left alone; if you use the FullDiff compare option, such changes will
                         be reported as drifts.
diff --git a/config/crd/bases/placement.kubernetes-fleet.io_resourceplacements.yaml b/config/crd/bases/placement.kubernetes-fleet.io_resourceplacements.yaml
@@ -742,8 +742,8 @@ spec:
                             managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
                             option.
 
-                            Note that this option would revert any ad-hoc changes made on the member cluster side in
-                            the managed fields; if you would like to make temporary edits on the member cluster side
+                            Note that this option would revert any ad-hoc changes made on the member cluster side in the
+                            managed fields; if you would like to make temporary edits on the member cluster side
                             in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
                             fields will be left alone; if you use the FullDiff compare option, such changes will
                             be reported as drifts.
@@ -840,6 +840,28 @@ spec:
                         - Never
                         type: string
                     type: object
+                  deleteStrategy:
+                    description: DeleteStrategy configures the deletion behavior when
+                      the ClusterResourcePlacement is deleted.
+                    properties:
+                      propagationPolicy:
+                        default: Abandon
+                        description: |-
+                          PropagationPolicy controls how the deletion is propagated to placed resources.
+                          Defaults to "Abandon".
+
+                          Available options:
+
+                          * Abandon: all placed resources on member clusters will be left intact (abandoned)
+                            when the ClusterResourcePlacement is deleted. This is the default behavior.
+
+                          * Delete: all placed resources on member clusters will be deleted when the
+                            ClusterResourcePlacement is deleted.
+                        enum:
+                        - Abandon
+                        - Delete
+                        type: string
+                    type: object
                   rollingUpdate:
                     description: Rolling update config params. Present only if RolloutStrategyType
                       = RollingUpdate.
diff --git a/config/crd/bases/placement.kubernetes-fleet.io_resourcesnapshots.yaml b/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.
diff --git a/config/crd/bases/placement.kubernetes-fleet.io_works.yaml b/config/crd/bases/placement.kubernetes-fleet.io_works.yaml
@@ -433,8 +433,8 @@ spec:
                         managed by Fleet (i.e., specified in the hub cluster manifest). This is the default
                         option.
 
-                        Note that this option would revert any ad-hoc changes made on the member cluster side in
-                        the managed fields; if you would like to make temporary edits on the member cluster side
+                        Note that this option would revert any ad-hoc changes made on the member cluster side in the
+                        managed fields; if you would like to make temporary edits on the member cluster side
                         in the managed fields, switch to IfNotDrifted option. Note that changes in unmanaged
                         fields will be left alone; if you use the FullDiff compare option, such changes will
                         be reported as drifts.
