Enhancement to support multiple DRPC for epic-6681

Allow the application users to have multiple DRPCs for the same discovered application namespace(s). Remove the DRPC conflict check to enable the Ramen operator to create multiple VRGs within the same namespace. Signed-off-by: pruthvitd <[email protected]>
RamenDR · Feb 19, 2025 · bc8c163 · bc8c163
1 parent e2d4809
commit bc8c163
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 5 deletions.
diff --git a/internal/controller/api/hub_managed_cluster_apis.go b/internal/controller/api/hub_managed_cluster_apis.go
@@ -0,0 +1,60 @@
+// SPDX-FileCopyrightText: The RamenDR authors
+// SPDX-License-Identifier: Apache-2.0
+
+package api
+
+const (
+  VMRecipeName = "vm-recipe"
+  VMRecipe = `
+apiVersion: ramendr.openshift.io/v1alpha1
+kind: Recipe
+metadata:
+  name: vm-recipe
+  namespace: ramen-ops
+spec:
+  appType: vm-dv
+  groups:
+  - backupRef: vm-dv
+    excludedResourceTypes:
+    - events
+    - event.events.k8s.io
+    - persistentvolumes
+    - replicaset
+    - persistentvolumeclaims
+    - pods
+    includedResources:
+    - namespaces
+    - nodes
+    includedNamespaces:
+    - vm-dv
+    labelSelector:
+      matchExpressions:
+      - key: appname
+        operator: In
+        values:
+        - vm
+    name: vm-dv
+    type: resource
+  workflows:
+  - failOn: any-error
+    name: backup
+    sequence:
+    - group: vm-dv
+  - failOn: any-error
+    name: restore
+    sequence:
+    - group: vm-dv
+  volumes:
+    includedNamespaces:
+    - vm-dv
+    name: varlog
+    type: volume
+    labelSelector:
+      matchExpressions:
+      - key: appname
+        operator: In
+        values:
+        - vm
+`
+)
+
diff --git a/internal/controller/drplacementcontrol_controller.go b/internal/controller/drplacementcontrol_controller.go
@@ -15,6 +15,7 @@ import (
 	"github.com/go-logr/logr"
 	"github.com/google/uuid"
 	plrv1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1"
+	rmnapi "github.com/ramendr/ramen/internal/controller/api"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -2466,10 +2467,13 @@ func (r *DRPlacementControlReconciler) twoDRPCsConflict(ctx context.Context,
 		return fmt.Errorf("failed to get protected namespaces for drpc: %v, %w", otherDRPC.Name, err)
 	}
 
-	conflict := drpcsProtectCommonNamespace(drpcProtectedNamespaces, otherDRPCProtectedNamespaces)
-	if conflict {
-		return fmt.Errorf("drpc: %s and drpc: %s protect the same namespace",
-			drpc.Name, otherDRPC.Name)
+	potentialConflict := drpcsProtectCommonNamespace(drpcProtectedNamespaces, otherDRPCProtectedNamespaces)
+	if potentialConflict {
+		independentVMProtection := drpcProtectVMInNS(drpc, otherDRPC, ramenConfig, log)
+		if !independentVMProtection {
+			return fmt.Errorf("drpc: %s and drpc: %s protect common resources from the same namespace",
+				drpc.Name, otherDRPC.Name)
+		}
 	}
 
 	return nil
@@ -2499,3 +2503,27 @@ func (r *DRPlacementControlReconciler) drpcHaveCommonClusters(ctx context.Contex
 
 	return drpolicyClusters.Intersection(otherDrpolicyClusters).Len() > 0, nil
 }
+
+func drpcProtectVMInNS(drpc *rmn.DRPlacementControl, otherdrpc *rmn.DRPlacementControl,
+	ramenConfig *rmn.RamenConfig, log logr.Logger) bool {
+	log.Info("In DRPC Protect VM in NS Validation")
+	drpcName := drpc.Spec.KubeObjectProtection.RecipeRef.Name
+	otherDrpcName := otherdrpc.Spec.KubeObjectProtection.RecipeRef.Name
+	if drpcName == rmnapi.VMRecipeName && otherDrpcName == rmnapi.VMRecipeName {
+
+		ramenOpsNS := RamenOperandsNamespace(*ramenConfig)
+		log.Info("It could be Independent VM protection.")
+		log.Info("Ramen Ops namespace is : " + ramenOpsNS)
+
+		if drpc.Spec.KubeObjectProtection.RecipeRef.Namespace == ramenOpsNS &&
+			otherdrpc.Spec.KubeObjectProtection.RecipeRef.Namespace == ramenOpsNS {
+			log.Info("Its a valid Independent VM protection.")
+
+			return true
+		}
+	}
+
+	log.Info("It isn't a valid Independent VM protection.")
+
+	return false
+}
diff --git a/internal/controller/vrg_recipe.go b/internal/controller/vrg_recipe.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/go-logr/logr"
 	ramen "github.com/ramendr/ramen/api/v1alpha1"
+	rmnapi "github.com/ramendr/ramen/internal/controller/api"
 	"github.com/ramendr/ramen/internal/controller/kubeobjects"
 	"github.com/ramendr/ramen/internal/controller/util"
 	recipe "github.com/ramendr/recipe/api/v1alpha1"
@@ -22,6 +23,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
+	"sigs.k8s.io/yaml"
 )
 
 type RecipeElements struct {
@@ -116,7 +118,13 @@ func RecipeElementsGet(ctx context.Context, reader client.Reader, vrg ramen.Volu
 	}
 
 	recipe := recipe.Recipe{}
-	if err := reader.Get(ctx, recipeNamespacedName, &recipe); err != nil {
+
+	if vrg.Spec.KubeObjectProtection.RecipeRef.Namespace == RamenOperandsNamespace(ramenConfig) &&
+		vrg.Spec.KubeObjectProtection.RecipeRef.Name == rmnapi.VMRecipeName {
+		if err := yaml.Unmarshal([]byte(rmnapi.VMRecipe), &recipe); err != nil {
+			return recipeElements, fmt.Errorf("recipe %v get error: %w", recipeNamespacedName.String(), err)
+		}
+	} else if err := reader.Get(ctx, recipeNamespacedName, &recipe); err != nil {
 		return recipeElements, fmt.Errorf("recipe %v get error: %w", recipeNamespacedName.String(), err)
 	}