Add manual paused annotation

Signed-off-by: Kashif Khan <[email protected]>

Author: kashifest

controllers/metal3machine_controller.go

@@ -37,7 +37,6 @@ import (
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/annotations"
 	deprecatedv1beta1conditions "sigs.k8s.io/cluster-api/util/conditions/deprecated/v1beta1"
-	"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
 	v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
 	v1beta2conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions/v1beta2"
 	v1beta1patch "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/patch"
@@ -179,7 +178,7 @@ func (r *Metal3MachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	// Check pause annotation on associated bmh (if any)
 	if annotations.IsPaused(cluster, capm3Machine) {
 		annotations.AddAnnotations(capm3Machine, map[string]string{"clusterctl.cluster.x-k8s.io/block-move": ""})
-		err := machineMgr.SetPauseAnnotation(ctx)
+		err = machineMgr.SetPauseAnnotation(ctx)
 		if err != nil {
 			machineLog.Info("failed to set pause annotation on associated bmh")
 			v1beta1conditions.MarkFalse(capm3Machine, infrav1.AssociateBMHCondition, infrav1.PauseAnnotationSetFailedReason, clusterv1beta1.ConditionSeverityInfo, "")
@@ -204,7 +203,7 @@ func (r *Metal3MachineReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	err = machineMgr.RemovePauseAnnotation(ctx)
 	if err != nil {
 		machineLog.Info("failed to remove pause annotation on associated bmh")
-		conditions.MarkFalse(capm3Machine, infrav1.AssociateBMHCondition, infrav1.PauseAnnotationRemoveFailedReason, clusterv1.ConditionSeverityInfo, "")
+		v1beta1conditions.MarkFalse(capm3Machine, infrav1.AssociateBMHCondition, infrav1.PauseAnnotationRemoveFailedReason, clusterv1beta1.ConditionSeverityInfo, "")
 		return ctrl.Result{}, nil
 	}
 

test/e2e/pivoting.go

@@ -218,6 +218,9 @@ func pivoting(ctx context.Context, inputGetter func() PivotingInput) {
 		Logf("Error: %v", err)
 	}
 
+	By("Add paused annotation to BMHs")
+	addPausedAnnotation(ctx, input.BootstrapClusterProxy)
+
 	By("Moving the cluster to self hosted")
 	clusterctl.Move(ctx, clusterctl.MoveInput{
 		LogFolder:            filepath.Join(input.ArtifactFolder, "clusters", input.ClusterName+"-bootstrap"),
@@ -243,6 +246,9 @@ func pivoting(ctx context.Context, inputGetter func() PivotingInput) {
 		ClusterctlConfigPath: input.ClusterctlConfigPath,
 	})
 
+	By("Remove paused annotation from BMH")
+	removePausedAnnotation(ctx, input.TargetCluster)
+
 	By("Remove BMO deployment from the source cluster")
 	RemoveDeployment(ctx, func() RemoveDeploymentInput {
 		return RemoveDeploymentInput{
@@ -500,6 +506,9 @@ func rePivoting(ctx context.Context, inputGetter func() RePivotingInput) {
 		return input.BootstrapClusterProxy.GetClient().Get(ctx, client.ObjectKey{Name: "kube-system"}, kubeSystem)
 	}, "5s", "100ms").Should(Succeed(), "Failed to assert bootstrap API server stability")
 
+	By("Add paused annotation to BMHs")
+	addPausedAnnotation(ctx, input.TargetCluster)
+
 	By("Move back to bootstrap cluster")
 	clusterctl.Move(ctx, clusterctl.MoveInput{
 		LogFolder:            filepath.Join(input.ArtifactFolder, "clusters", input.ClusterName+"-pivot"),
@@ -526,6 +535,9 @@ func rePivoting(ctx context.Context, inputGetter func() RePivotingInput) {
 	})
 	Expect(controlPlane).ToNot(BeNil())
 
+	By("Remove paused annotation from BMHs")
+	removePausedAnnotation(ctx, input.BootstrapClusterProxy)
+
 	By("Check that BMHs are in provisioned state")
 	WaitForNumBmhInState(ctx, bmov1alpha1.StateProvisioned, WaitForNumInput{
 		Client:    input.BootstrapClusterProxy.GetClient(),
@@ -586,3 +598,38 @@ func fetchContainerLogs(containerNames *[]string, folder string, containerComman
 		Expect(writeErr).ToNot(HaveOccurred())
 	}
 }
+
+func removePausedAnnotation(ctx context.Context, targetCluster framework.ClusterProxy) {
+	bmhs, err := GetAllBmhs(ctx, targetCluster.GetClient(), "metal3")
+	Expect(err).ToNot(HaveOccurred(), "Cannot fetch BMHs")
+	for _, bmh := range bmhs {
+		if bmh.ObjectMeta.Annotations != nil {
+			if _, ok := bmh.ObjectMeta.Annotations[bmov1alpha1.PausedAnnotation]; ok {
+				delete(bmh.ObjectMeta.Annotations, bmov1alpha1.PausedAnnotation)
+				err = targetCluster.GetClient().Update(ctx, &bmh)
+				if err != nil {
+					Logf("Cannot remove paused annotation from BMH %s: %v", bmh.Name, err)
+				}
+				Logf("Removed paused annotation from BMH %s", bmh.Name)
+			}
+		}
+	}
+	Expect(err).ToNot(HaveOccurred(), "Cannot remove paused annotation from BMHs")
+}
+
+func addPausedAnnotation(ctx context.Context, targetCluster framework.ClusterProxy) {
+	bmhs, err := GetAllBmhs(ctx, targetCluster.GetClient(), "metal3")
+	Expect(err).ToNot(HaveOccurred(), "Cannot fetch BMHs")
+	for _, bmh := range bmhs {
+		if bmh.ObjectMeta.Annotations == nil {
+			bmh.ObjectMeta.Annotations = map[string]string{}
+		}
+		bmh.ObjectMeta.Annotations[bmov1alpha1.PausedAnnotation] = "manual-pivoting"
+		err = targetCluster.GetClient().Update(ctx, &bmh)
+		if err != nil {
+			Logf("Cannot add paused annotation to BMH %s: %v", bmh.Name, err)
+		}
+		Logf("Added paused annotation to BMH %s", bmh.Name)
+	}
+	Expect(err).ToNot(HaveOccurred(), "Cannot add paused annotation to BMHs")
+}