Merge pull request #292 from umangachapagain/remove-mirrpeersecretcontroller

remove mirrorpeersecret reconciler and unused utility functions

Author: openshift-merge-bot[bot]

controllers/common_controller_utils.go

@@ -96,37 +96,6 @@ func getFakeDRPolicyReconciler(drpolicy *ramenv1alpha1.DRPolicy, mp *multicluste
 			Name: cName2,
 		},
 	}
-
-	// Constitutes both blue secret and green secret present on the hub
-	hubSecret1 := corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      utils.GetSecretNameByPeerRef(mp.Spec.Items[0]),
-			Namespace: cName1,
-		},
-		Data: map[string][]byte{
-			"namespace":              []byte("openshift-storage"),
-			"secret-data":            []byte(`{"cluster":"b2NzLXN0b3JhZ2VjbHVzdGVyLWNlcGhjbHVzdGVy","token":"ZXlKbWMybGtJam9pWXpSak56SmpNRE10WXpCbFlpMDBZMlppTFRnME16RXRNekExTmpZME16UmxZV1ZqSWl3aVkyeHBaVzUwWDJsa0lqb2ljbUprTFcxcGNuSnZjaTF3WldWeUlpd2lhMlY1SWpvaVFWRkVkbGxyTldrM04xbG9TMEpCUVZZM2NFZHlVVXBrU1VvelJtZGpjVWxGVUZWS0wzYzlQU0lzSW0xdmJsOW9iM04wSWpvaU1UY3lMak13TGpFd01TNHlORGs2TmpjNE9Td3hOekl1TXpBdU1UZ3pMakU1TURvMk56ZzVMREUzTWk0ek1DNHlNak11TWpFd09qWTNPRGtpTENKdVlXMWxjM0JoWTJVaU9pSnZjR1Z1YzJocFpuUXRjM1J2Y21GblpTSjk="}`),
-			"secret-origin":          []byte("rook"),
-			"storage-cluster-name":   []byte("ocs-storagecluster"),
-			utils.SecretStorageIDKey: []byte("{\"cephfs\":\"f9708852fe4cf1f4d5de7e525f1b0aba\",\"rbd\":\"dcd70114947d0bb1f6b96f0dd6a9aaca\"}"),
-		},
-		Type: "multicluster.odf.openshift.io/secret-type",
-	}
-
-	hubSecret2 := corev1.Secret{
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      utils.GetSecretNameByPeerRef(mp.Spec.Items[1]),
-			Namespace: cName2,
-		},
-		Data: map[string][]byte{
-			"namespace":              []byte("openshift-storage"),
-			"secret-data":            []byte(`{"cluster":"b2NzLXN0b3JhZ2VjbHVzdGVyLWNlcGhjbHVzdGVy","token":"ZXlKbWMybGtJam9pWXpSak56SmpNRE10WXpCbFlpMDBZMlppTFRnME16RXRNekExTmpZME16UmxZV1ZqSWl3aVkyeHBaVzUwWDJsa0lqb2ljbUprTFcxcGNuSnZjaTF3WldWeUlpd2lhMlY1SWpvaVFWRkVkbGxyTldrM04xbG9TMEpCUVZZM2NFZHlVVXBrU1VvelJtZGpjVWxGVUZWS0wzYzlQU0lzSW0xdmJsOW9iM04wSWpvaU1UY3lMak13TGpFd01TNHlORGs2TmpjNE9Td3hOekl1TXpBdU1UZ3pMakU1TURvMk56ZzVMREUzTWk0ek1DNHlNak11TWpFd09qWTNPRGtpTENKdVlXMWxjM0JoWTJVaU9pSnZjR1Z1YzJocFpuUXRjM1J2Y21GblpTSjk="}`),
-			"secret-origin":          []byte("rook"),
-			"storage-cluster-name":   []byte("ocs-storagecluster"),
-			utils.SecretStorageIDKey: []byte("{\"cephfs\":\"f9708852fe4cf1f4d5de7e525f1b0aba\",\"rbd\":\"dcd70114947d0bb1f6b96f0dd6a9aaca\"}"),
-		},
-		Type: "multicluster.odf.openshift.io/secret-type",
-	}
 	odfClientInfoConfigMap := &corev1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      "odf-client-info",
@@ -146,7 +115,7 @@ func getFakeDRPolicyReconciler(drpolicy *ramenv1alpha1.DRPolicy, mp *multicluste
 		},
 	}
 
-	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(drpolicy, mp, ns1, ns2, &hubSecret1, &hubSecret2, odfClientInfoConfigMap).Build()
+	fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithObjects(drpolicy, mp, ns1, ns2, odfClientInfoConfigMap).Build()
 
 	r := DRPolicyReconciler{
 		HubClient:        fakeClient,

controllers/drpolicy_controller_test.go

@@ -194,17 +194,6 @@ func (o *ManagerOptions) runManager(ctx context.Context) {
 	}
 	//+kubebuilder:scaffold:builder
 
-	if err = (&MirrorPeerSecretReconciler{
-		Client:           mgr.GetClient(),
-		Scheme:           mgr.GetScheme(),
-		Logger:           logger.With("controller", "MirrorPeerSecretReconciler"),
-		testEnvFile:      o.testEnvFile,
-		CurrentNamespace: currentNamespace,
-	}).SetupWithManager(mgr); err != nil {
-		logger.Error("Failed to create MirrorPeer controller", "error", err)
-		os.Exit(1)
-	}
-
 	if err = (&ManagedClusterReconciler{
 		Client:           mgr.GetClient(),
 		Logger:           logger.With("controller", "ManagedClusterReconciler"),

controllers/manager.go

@@ -275,7 +275,7 @@ func (r *MirrorPeerReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 				logger.Error("Error in fetching s3 internal secret", "Cluster", peerRef.ClusterName, "error", err)
 				return ctrl.Result{}, err
 			}
-			err = createOrUpdateSecretsFromInternalSecret(ctx, r.Client, r.CurrentNamespace, &s3Secret, []multiclusterv1alpha1.MirrorPeer{mirrorPeer}, logger)
+			err = utils.CreateOrUpdateSecretsFromInternalSecret(ctx, r.Client, r.CurrentNamespace, &s3Secret, []multiclusterv1alpha1.MirrorPeer{mirrorPeer}, logger)
 			if err != nil {
 				logger.Error("Error in updating S3 profile", "Cluster", peerRef.ClusterName, "error", err)
 				return ctrl.Result{}, err