Merge pull request #313 from umangachapagain/provider-mdr-fixes

Fixes for MDR with provider mode

Author: openshift-merge-bot[bot]

addons/agent_mirrorpeer_controller.go

@@ -356,17 +356,36 @@ func (r *MirrorPeerReconciler) hasSpokeCluster(obj client.Object) bool {
 	return false
 }
 
+func (r *MirrorPeerReconciler) hasProviderSpokeCluster(obj client.Object) bool {
+	mp, ok := obj.(*multiclusterv1alpha1.MirrorPeer)
+	if !ok {
+		return false
+	}
+	if mp.Status.Phase == multiclusterv1alpha1.IncompatibleVersion {
+		return false
+	}
+	peerRefs, err := utils.GetPeerRefForProviderCluster(context.TODO(), r.SpokeClient, r.HubClient, mp)
+	if err != nil {
+		r.Logger.Error("Unable to reconcile MirrorPeer", "MirrorPeer", mp.GetName(), "Error", err)
+		return false
+	}
+	if len(peerRefs) > 0 {
+		return true
+	}
+	return false
+}
+
 // SetupWithManager sets up the controller with the Manager.
 func (r *MirrorPeerReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	mirrorPeerSpokeClusterPredicate := predicate.Funcs{
 		CreateFunc: func(e event.CreateEvent) bool {
-			return r.hasSpokeCluster(e.Object)
+			return r.hasSpokeCluster(e.Object) || r.hasProviderSpokeCluster(e.Object)
 		},
 		DeleteFunc: func(e event.DeleteEvent) bool {
-			return r.hasSpokeCluster(e.Object)
+			return r.hasSpokeCluster(e.Object) || r.hasProviderSpokeCluster(e.Object)
 		},
 		UpdateFunc: func(e event.UpdateEvent) bool {
-			return r.hasSpokeCluster(e.ObjectNew)
+			return r.hasSpokeCluster(e.ObjectNew) || r.hasProviderSpokeCluster(e.ObjectNew)
 		},
 		GenericFunc: func(_ event.GenericEvent) bool {
 			return false

addons/s3_secret_handler.go

@@ -66,7 +66,7 @@ func (r *S3SecretReconciler) syncBlueSecretForS3(ctx context.Context, name strin
 			return fmt.Errorf("failed to find client peerRef for current provider cluster %s. %w", r.SpokeClusterName, err)
 		}
 		if len(storagePeerRefList) > 1 {
-			return fmt.Errorf("MirrorPeer has multiple clients pointing to same provider which is unsupported")
+			s3ProfileName = fmt.Sprintf("%s-%s", utils.S3ProfilePrefix, r.SpokeClusterName)
 		}
 		if len(storagePeerRefList) < 1 {
 			r.Logger.Info("OBC references MirrorPeer which is not related to this provider.", "OBC Name", name, "OBC Namespace", namespace, "MirrorPeer", mirrorPeerName)
@@ -77,7 +77,9 @@ func (r *S3SecretReconciler) syncBlueSecretForS3(ctx context.Context, name strin
 	}
 
 	storageClusterRef = &storagePeerRef.StorageClusterRef
-	s3ProfileName = fmt.Sprintf("%s-%s-%s", utils.S3ProfilePrefix, storagePeerRef.ClusterName, storagePeerRef.StorageClusterRef.Name)
+	if s3ProfileName == "" {
+		s3ProfileName = fmt.Sprintf("%s-%s-%s", utils.S3ProfilePrefix, storagePeerRef.ClusterName, storagePeerRef.StorageClusterRef.Name)
+	}
 
 	// fetch s3 endpoint
 	route := &routev1.Route{}

controllers/mirrorpeer_controller.go

@@ -325,7 +325,7 @@ func (r *MirrorPeerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 		}
 	}
 
-	if hasStorageClientRef {
+	if hasStorageClientRef && mirrorPeer.Spec.Type == multiclusterv1alpha1.Async {
 		result, err := createStorageClusterPeer(ctx, r.Client, logger, r.CurrentNamespace, mirrorPeer)
 		if err != nil {
 			logger.Error("Failed to create StorageClusterPeer", "error", err)