Delete ManagedClusterView for DRClusterConfig on DRCluster deletion

Signed-off-by: Shyamsundar Ranganathan <[email protected]>

Author: ShyamsundarR

internal/controller/drclusters.go

@@ -249,6 +249,10 @@ func drClusterUndeploy(
 		return err
 	}
 
+	if err := mcv.DeleteDRClusterConfigManagedClusterView(drcluster.GetName()); err != nil {
+		return err
+	}
+
 	if err := mwu.DeleteManifestWork(mwu.BuildManifestWorkName(util.MWTypeDRCConfig), drcluster.GetName()); err != nil {
 		return err
 	}

internal/controller/drpolicy_peerclass.go

@@ -541,7 +541,7 @@ func getClusterClasses(
 	annotations := make(map[string]string)
 	annotations[AllDRPolicyAnnotation] = cluster
 
-	drcConfig, err := m.GetDRClusterConfigFromManagedCluster(cluster, cluster, annotations)
+	drcConfig, err := m.GetDRClusterConfigFromManagedCluster(cluster, annotations)
 	if err != nil {
 		return classLists{}, err
 	}

internal/controller/fake_mcv_test.go

@@ -33,12 +33,16 @@ type FakeMCVGetter struct {
 }
 
 func (f FakeMCVGetter) GetDRClusterConfigFromManagedCluster(
-	resourceName, managedCluster string,
+	resourceName string,
 	annotations map[string]string,
 ) (*rmn.DRClusterConfig, error) {
 	return nil, nil
 }
 
+func (f FakeMCVGetter) DeleteDRClusterConfigManagedClusterView(clusterName string) error {
+	return nil
+}
+
 func (f FakeMCVGetter) GetSClassFromManagedCluster(resourceName, managedCluster string, annotations map[string]string,
 ) (*storagev1.StorageClass, error) {
 	return nil, nil

internal/controller/util/mcv_util.go

@@ -43,9 +43,11 @@ type ManagedClusterViewGetter interface {
 	ListMModesMCVs(managedCluster string) (*viewv1beta1.ManagedClusterViewList, error)
 
 	GetDRClusterConfigFromManagedCluster(
-		resourceName, managedCluster string,
+		resourceName string,
 		annotations map[string]string) (*rmn.DRClusterConfig, error)
 
+	DeleteDRClusterConfigManagedClusterView(clusterName string) error
+
 	GetSClassFromManagedCluster(
 		resourceName, managedCluster string,
 		annotations map[string]string) (*storagev1.StorageClass, error)
@@ -198,18 +200,19 @@ func (m ManagedClusterViewGetterImpl) ListMModesMCVs(cluster string) (*viewv1bet
 	return m.listMCVsWithLabel(cluster, map[string]string{MModesLabel: ""})
 }
 
-func (m ManagedClusterViewGetterImpl) GetDRClusterConfigFromManagedCluster(resourceName, managedCluster string,
+func (m ManagedClusterViewGetterImpl) GetDRClusterConfigFromManagedCluster(
+	clusterName string,
 	annotations map[string]string,
 ) (*rmn.DRClusterConfig, error) {
 	drcConfig := &rmn.DRClusterConfig{}
 
 	err := m.getResourceFromManagedCluster(
-		resourceName,
+		clusterName,
 		"",
-		managedCluster,
+		clusterName,
 		annotations,
 		nil,
-		BuildManagedClusterViewName(resourceName, "", MWTypeDRCConfig),
+		BuildManagedClusterViewName(clusterName, "", MWTypeDRCConfig),
 		"DRClusterConfig",
 		rmn.GroupVersion.Group,
 		rmn.GroupVersion.Version,
@@ -477,6 +480,13 @@ func (m ManagedClusterViewGetterImpl) DeleteNFManagedClusterView(
 	return m.DeleteManagedClusterView(clusterName, mcvNameNF, logger)
 }
 
+func (m ManagedClusterViewGetterImpl) DeleteDRClusterConfigManagedClusterView(clusterName string) error {
+	logger := ctrl.Log.WithName("MCV").WithValues("resouceName", clusterName)
+	mcvNameDRCConfig := BuildManagedClusterViewName(clusterName, "", MWTypeDRCConfig)
+
+	return m.DeleteManagedClusterView(clusterName, mcvNameDRCConfig, logger)
+}
+
 func (m ManagedClusterViewGetterImpl) DeleteManagedClusterView(clusterName, mcvName string, logger logr.Logger) error {
 	logger.Info("Delete ManagedClusterView from", "namespace", clusterName, "name", mcvName)