Fixes issue when multiple VRGs conflict with the PVCs being protected

.github/workflows/ci.yaml

@@ -114,7 +114,12 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
+        python-version:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13-dev"
     steps:
       - name: Checkout source
         uses: actions/checkout@v4
@@ -178,8 +183,12 @@ jobs:
     runs-on: ubuntu-22.04
     strategy:
       matrix:
-        python-version: ["3.9", "3.10", "3.11"]
-
+        python-version:
+          - "3.9"
+          - "3.10"
+          - "3.11"
+          - "3.12"
+          - "3.13-dev"
     steps:
       - name: Checkout source
         uses: actions/checkout@v4

.github/workflows/e2e-daily.yaml

@@ -0,0 +1,36 @@
+# SPDX-FileCopyrightText: The RamenDR authors
+# SPDX-License-Identifier: Apache-2.0
+
+---
+# yamllint disable rule:line-length
+name: E2E Daily
+
+on:  # yamllint disable-line rule:truthy
+  # Run every day on 03:00.
+  schedule:
+    - cron: '0 3 * * *'
+  # Allow manual run.
+  # (Actions -> E2E Daily -> Run workflow)
+  workflow_dispatch:
+
+jobs:
+  refresh-cache:
+    runs-on: [self-hosted, e2e-rdr]
+    if: github.repository == 'RamenDR/ramen'
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Install drenv
+        run: pip install -e test
+
+      - name: Refresh cache
+        uses: nick-fields/retry@v3
+        with:
+          timeout_minutes: 2
+          retry_wait_seconds: 60
+          max_attempts: 10
+          command: |
+            cd test
+            drenv cache -v envs/regional-dr.yaml

.github/workflows/e2e.yaml

@@ -29,7 +29,7 @@ jobs:
 
     - name: Setup drenv
       working-directory: test
-      run: drenv setup -v
+      run: drenv setup -v envs/regional-dr.yaml
 
     - name: Install ramenctl
       run: pip install -e ramenctl
@@ -100,4 +100,4 @@ jobs:
     - name: Cleanup drenv
       if: always()
       working-directory: test
-      run: drenv cleanup -v
+      run: drenv cleanup -v envs/regional-dr.yaml

Makefile

@@ -176,6 +176,9 @@ test-drcluster: generate manifests envtest ## Run DRCluster tests.
 test-drpolicy: generate manifests envtest ## Run DRPolicy tests.
 	 go test ./internal/controller -coverprofile cover.out  -ginkgo.focus DRPolicyController
 
+test-drclusterconfig: generate manifests envtest ## Run DRClusterConfig tests.
+	 go test ./internal/controller -coverprofile cover.out  -ginkgo.focus DRClusterConfig
+
 test-util: generate manifests envtest ## Run util tests.
 	 go test ./internal/controller/util -coverprofile cover.out
 

api/go.mod

@@ -1,10 +1,13 @@
 module github.com/ramendr/ramen/api
 
-go 1.22.6
+go 1.22.0
+
+toolchain go1.22.7
 
 require (
 	k8s.io/api v0.29.0
 	k8s.io/apimachinery v0.29.0
+	k8s.io/component-base v0.28.3
 	sigs.k8s.io/controller-runtime v0.16.3
 )
 
@@ -19,7 +22,6 @@ require (
 	golang.org/x/text v0.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	k8s.io/component-base v0.28.3 // indirect
 	k8s.io/klog/v2 v2.110.1 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

cmd/main.go

@@ -15,11 +15,8 @@ import (
 
 	volsyncv1alpha1 "github.com/backube/volsync/api/v1alpha1"
 	volrep "github.com/csi-addons/kubernetes-csi-addons/api/replication.storage/v1alpha1"
-	groupsnapv1alpha1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumegroupsnapshot/v1alpha1"
-	snapv1 "github.com/kubernetes-csi/external-snapshotter/client/v7/apis/volumesnapshot/v1"
-	clrapiv1beta1 "github.com/open-cluster-management-io/api/cluster/v1beta1"
-	ocmv1 "github.com/open-cluster-management/api/cluster/v1"
-	ocmworkv1 "github.com/open-cluster-management/api/work/v1"
+	groupsnapv1alpha1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1alpha1"
+	snapv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
 	viewv1beta1 "github.com/stolostron/multicloud-operators-foundation/pkg/apis/view/v1beta1"
 	plrv1 "github.com/stolostron/multicloud-operators-placementrule/pkg/apis/apps/v1"
 	velero "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
@@ -29,6 +26,10 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ocmv1 "open-cluster-management.io/api/cluster/v1"
+	clusterv1alpha1 "open-cluster-management.io/api/cluster/v1alpha1"
+	clrapiv1beta1 "open-cluster-management.io/api/cluster/v1beta1"
+	ocmworkv1 "open-cluster-management.io/api/work/v1"
 	cpcv1 "open-cluster-management.io/config-policy-controller/api/v1"
 	gppv1 "open-cluster-management.io/governance-policy-propagator/api/v1"
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -119,6 +120,7 @@ func configureController(ramenConfig *ramendrv1alpha1.RamenConfig) error {
 		utilruntime.Must(groupsnapv1alpha1.AddToScheme(scheme))
 		utilruntime.Must(recipe.AddToScheme(scheme))
 		utilruntime.Must(apiextensions.AddToScheme(scheme))
+		utilruntime.Must(clusterv1alpha1.AddToScheme(scheme))
 	}
 
 	return nil
@@ -174,6 +176,7 @@ func setupReconcilersCluster(mgr ctrl.Manager, ramenConfig *ramendrv1alpha1.Rame
 	if err := (&controllers.DRClusterConfigReconciler{
 		Client: mgr.GetClient(),
 		Scheme: mgr.GetScheme(),
+		Log:    ctrl.Log.WithName("controllers").WithName("DRClusterConfig"),
 	}).SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "DRClusterConfig")
 		os.Exit(1)

config/dr-cluster/manifests/bases/ramen_dr_cluster.clusterserviceversion.yaml

@@ -3,7 +3,7 @@ kind: ClusterServiceVersion
 metadata:
   annotations:
     alm-examples: '[]'
-    capabilities: Basic Install
+    capabilities: Seamless Upgrades
     operators.openshift.io/infrastructure-features: '["disconnected"]'
   name: ramen-dr-cluster-operator.v0.0.0
   namespace: placeholder

config/dr-cluster/rbac/role.yaml

@@ -137,6 +137,17 @@ rules:
   - patch
   - update
   - watch
+- apiGroups:
+  - cluster.open-cluster-management.io
+  resources:
+  - clusterclaims
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - ramendr.openshift.io
   resources:

config/hub/manifests/bases/ramen_hub.clusterserviceversion.yaml

@@ -3,7 +3,7 @@ kind: ClusterServiceVersion
 metadata:
   annotations:
     alm-examples: '[]'
-    capabilities: Basic Install
+    capabilities: Seamless Upgrades
     operators.openshift.io/infrastructure-features: '["disconnected"]'
   name: ramen-hub-operator.v0.0.0
   namespace: placeholder

config/prometheus/alerts.yaml

@@ -38,6 +38,5 @@ spec:
           labels:
             severity: warning
           annotations:
-            description: "Workload is not protected for disaster recovery (DRPC: {{ $labels.obj_name }}, Namespace: {{ $labels.obj_namespace }})."
+            description: "Workload is not protected for disaster recovery (DRPC: {{ $labels.obj_name }}, Namespace: {{ $labels.obj_namespace }}). Inspect DRPC status.conditions for details."
             alert_type: "DisasterRecovery"
-

config/rbac/role.yaml

@@ -85,6 +85,17 @@ rules:
   - get
   - list
   - watch
+- apiGroups:
+  - cluster.open-cluster-management.io
+  resources:
+  - clusterclaims
+  verbs:
+  - create
+  - delete
+  - get
+  - list
+  - update
+  - watch
 - apiGroups:
   - cluster.open-cluster-management.io
   resources:

docs/devel-quick-start.md

@@ -33,24 +33,14 @@ SPDX-License-Identifier: Apache-2.0
    git remote add upstream https://github.com/RamenDR/ramen.git
    ```
 
-1. Set up a commit-msg hook to sign off your commits
+1. Add the commit-msg hook to sign off your commits
 
    *Ramen* requires a `Signed-off-by: My Name <myemail@example.com>`
    footer in the commit message. To add it automatically to all commits,
    add this hook:
 
    ```sh
-   $ cat .git/hooks/commit-msg
-   #!/bin/sh
-   # Add Signed-off-by trailer.
-   sob=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-   git interpret-trailers --in-place --trailer "$sob" "$1"
-   ```
-
-   And make the hook executable:
-
-   ```sh
-   chmod +x .git/hooks/commit-msg
+   cp hack/commit-msg .git/hooks/
    ```
 
 ## Setting up the environment for development and testing

docs/krp.md

@@ -96,7 +96,8 @@ The VRG enables Kubernetes resources to be captured(backed up) and recovered as
 part of disaster protection.  This is accomplished through the
 kubeObjectProtection section of the VRG spec.  If kubeObjectProtection is not
 included in a VRG, then Kubernetes resources are not protected as part of the
-VRG disaster protection.
+VRG disaster protection. PVCs and PVs are protected by Ramen and all resources
+are protected and backed by kubeObjectProtection.
 
 The kubeObjectProtection section contains two sub-sections, captureOrder and
 recoverOrder.  This captureOrder section provides instructions on how to backup

docs/user-quick-start.md

@@ -135,14 +135,14 @@ enough resources:
    ```
 
 1. Install `clusteradm` tool. See
-   [Install clusteradm CLI tool](https://open-cluster-management.io/getting-started/installation/start-the-control-plane/#install-clusteradm-cli-tool)
+   [Install clusteradm CLI tool](https://open-cluster-management.io/docs/getting-started/installation/start-the-control-plane/#install-clusteradm-cli-tool)
    for the details.
    Version v0.8.1 or later is reuired.
 
 1. Install `subctl` tool, See
    [Submariner subctl installation](https://submariner.io/operations/deployment/subctl/)
    for the details.
-   Version v0.17.0 or later is required.
+   Version v0.18.0 or later is required.
 
 1. Install the `velero` tool
 

e2e/go.mod

@@ -1,6 +1,8 @@
 module github.com/ramendr/ramen/e2e
 
-go 1.22.6
+go 1.22.0
+
+toolchain go1.22.7
 
 require (
 	github.com/go-logr/logr v1.4.1