Merge pull request #8322 from pkbhowmick/add-patch-annotation

🌱 Add move annotation on objects for cluster move operation

Author: k8s-ci-robot

cmd/clusterctl/api/v1alpha3/annotations.go

@@ -25,4 +25,10 @@ const (
 	// Note: Only CRDs that are referenced by core Cluster API CRDs have to comply with the naming scheme.
 	// See the following issue for more information: https://github.com/kubernetes-sigs/cluster-api/issues/5686#issuecomment-1260897278
 	SkipCRDNamePreflightCheckAnnotation = "clusterctl.cluster.x-k8s.io/skip-crd-name-preflight-check"
+
+	// DeleteForMoveAnnotation will be set to objects that are going to be deleted from the
+	// source cluster after being moved to the target cluster during the clusterctl move operation.
+	//
+	// It will help any validation webhook to take decision based on it.
+	DeleteForMoveAnnotation = "clusterctl.cluster.x-k8s.io/delete-for-move"
 )

cmd/clusterctl/client/cluster/mover.go

@@ -35,6 +35,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
+	clusterctlv1 "sigs.k8s.io/cluster-api/cmd/clusterctl/api/v1alpha3"
 	logf "sigs.k8s.io/cluster-api/cmd/clusterctl/log"
 	"sigs.k8s.io/cluster-api/util/conditions"
 	"sigs.k8s.io/cluster-api/util/patch"
@@ -1064,7 +1065,8 @@ func (o *objectMover) deleteGroup(group moveGroup) error {
 }
 
 var (
-	removeFinalizersPatch = client.RawPatch(types.MergePatchType, []byte("{\"metadata\":{\"finalizers\":[]}}"))
+	removeFinalizersPatch           = client.RawPatch(types.MergePatchType, []byte("{\"metadata\":{\"finalizers\":[]}}"))
+	addDeleteForMoveAnnotationPatch = client.RawPatch(types.JSONPatchType, []byte(fmt.Sprintf("[{\"op\": \"add\", \"path\":\"/metadata/annotations\", \"value\":{%q:\"\"}}]", clusterctlv1.DeleteForMoveAnnotation)))
 )
 
 // deleteSourceObject deletes the Kubernetes object corresponding to the node from the source management cluster, taking care of removing all the finalizers so
@@ -1106,6 +1108,11 @@ func (o *objectMover) deleteSourceObject(nodeToDelete *node) error {
 			sourceObj.GroupVersionKind(), sourceObj.GetNamespace(), sourceObj.GetName())
 	}
 
+	if err := cFrom.Patch(ctx, sourceObj, addDeleteForMoveAnnotationPatch); err != nil {
+		return errors.Wrapf(err, "error adding delete-for-move annotation from %q %s/%s",
+			sourceObj.GroupVersionKind(), sourceObj.GetNamespace(), sourceObj.GetName())
+	}
+
 	if len(sourceObj.GetFinalizers()) > 0 {
 		if err := cFrom.Patch(ctx, sourceObj, removeFinalizersPatch); err != nil {
 			return errors.Wrapf(err, "error removing finalizers from %q %s/%s",

docs/book/src/developer/providers/migrations/v1.4-to-v1.5.md

@@ -29,7 +29,7 @@ maintainers of providers and consumers of our Go API.
 
 ### Other
 
-- 
+- clusterctl move is adding the new annotation `clusterctl.cluster.x-k8s.io/delete-for-move` before object deletion.
 
 ### Suggested changes for providers