Merge pull request #75 from openshift-cherrypick-robot/cherry-pick-74-to-release-4.10

Bug 2054131: [release-4.10] Add hub recovery labels to mirrorpeer

Author: openshift-merge-robot

controllers/mirrorpeer_controller.go

@@ -44,6 +44,8 @@ type MirrorPeerReconciler struct {
 	Scheme *runtime.Scheme
 }
 
+const hubRecoveryLabel = "cluster.open-cluster-management.io/backup"
+
 //+kubebuilder:rbac:groups=multicluster.odf.openshift.io,resources=mirrorpeers,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=multicluster.odf.openshift.io,resources=mirrorpeers/status,verbs=get;update;patch
 //+kubebuilder:rbac:groups=multicluster.odf.openshift.io,resources=mirrorpeers/finalizers,verbs=update
@@ -106,6 +108,30 @@ func (r *MirrorPeerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 	logger.V(2).Info("All validations for MirrorPeer passed", "MirrorPeer", req.NamespacedName)
 
+	mirrorPeerCopy := mirrorPeer.DeepCopy()
+	if mirrorPeerCopy.Labels == nil {
+		mirrorPeerCopy.Labels = make(map[string]string)
+	}
+
+	if val, ok := mirrorPeerCopy.Labels[hubRecoveryLabel]; !ok || val != "resource" {
+		logger.Info("Adding label to mirrorpeer for disaster recovery")
+		mirrorPeerCopy.Labels[hubRecoveryLabel] = "resource"
+		err = r.Client.Update(ctx, mirrorPeerCopy)
+
+		if k8serrors.IsConflict(err) {
+			logger.Info("MirrorPeer is being updated by another process. Retrying", "MirrorPeer", mirrorPeerCopy.Name)
+			return ctrl.Result{Requeue: true}, nil
+		} else if k8serrors.IsNotFound(err) {
+			logger.Info("MirrorPeer no longer exists. Ignoring since object must have been deleted", "MirrorPeer", mirrorPeerCopy.Name)
+			return ctrl.Result{}, nil
+		} else if err != nil {
+			logger.Info("Warning: Failed to update mirrorpeer", "MirrorPeer", mirrorPeerCopy.Name, "Error", err)
+		} else {
+			logger.Info("Successfully added label to mirrorpeer for disaster recovery", "MirrorPeer", mirrorPeerCopy.Name)
+			return ctrl.Result{Requeue: true}, nil
+		}
+	}
+
 	if mirrorPeer.Status.Phase == "" {
 		mirrorPeer.Status.Phase = multiclusterv1alpha1.ExchangingSecret
 		statusErr := r.Client.Status().Update(ctx, &mirrorPeer)

controllers/mirrorpeer_controller_test.go

@@ -1,3 +1,4 @@
+//go:build unit
 // +build unit
 
 /*
@@ -92,4 +93,14 @@ func TestMirrorPeerReconcilerReconcile(t *testing.T) {
 	if err != nil {
 		t.Errorf("MirrorPeerReconciler Reconcile() failed. Error: %s", err)
 	}
+
+	var mp multiclusterv1alpha1.MirrorPeer
+	err = r.Get(ctx, req.NamespacedName, &mp)
+	if err != nil {
+		t.Errorf("Failed to get MirrorPeer. Error: %s", err)
+	}
+
+	if val, ok := mp.Labels[hubRecoveryLabel]; !ok || val != "resource" {
+		t.Errorf("MirrorPeer.Labels[%s] is not set correctly. Expected: %s, Actual: %s", hubRecoveryLabel, "resource", val)
+	}
 }