Merge pull request #356 from red-hat-storage/sync_ds--main

Syncing latest changes from main for ramen

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 <[email protected]>`
    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

hack/commit-msg

@@ -0,0 +1,4 @@
+#!/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"

hack/install-setup-envtest.sh

@@ -3,7 +3,7 @@ set -e
 
 script_dir="$(cd "$(dirname "$0")" && pwd)"
 
-required_version="release-0.17"
+required_version="release-0.19"
 source_url="sigs.k8s.io/controller-runtime/tools/setup-envtest@${required_version}"
 target_dir="${script_dir}/../testbin"
 target_path="${target_dir}/setup-envtest"

internal/controller/kubeobjects/velero/requests.go

@@ -371,7 +371,8 @@ func getBackupSpecFromObjectsSpec(objectsSpec kubeobjects.Spec) velero.BackupSpe
 		IncludedResources:  objectsSpec.IncludedResources,
 		// exclude VRs from Backup so VRG can create them: see https://github.com/RamenDR/ramen/issues/884
 		ExcludedResources: append(objectsSpec.ExcludedResources, "volumereplications.replication.storage.openshift.io",
-			"replicationsources.volsync.backube", "replicationdestinations.volsync.backube"),
+			"replicationsources.volsync.backube", "replicationdestinations.volsync.backube",
+			"PersistentVolumeClaims", "PersistentVolumes"),
 		LabelSelector:           objectsSpec.LabelSelector,
 		OrLabelSelectors:        objectsSpec.OrLabelSelectors,
 		TTL:                     metav1.Duration{}, // TODO: set default here

test/addons/argocd/test

@@ -83,7 +83,13 @@ def undeploy_guestbook(hub, cluster):
             print(line)
 
     print(f"Deleting namespace argocd-test in cluster {cluster}")
-    kubectl.delete("namespace", "argocd-test", "--wait=false", context=cluster)
+    kubectl.delete(
+        "namespace",
+        "argocd-test",
+        "--wait=false",
+        "--ignore-not-found",
+        context=cluster,
+    )
 
 
 def wait_until_guestbook_is_deleted(hub, cluster):

test/addons/rook-pool/storage-class.yaml

@@ -20,3 +20,4 @@ parameters:
     csi.storage.k8s.io/node-stage-secret-namespace: rook-ceph
     csi.storage.k8s.io/fstype: ext4
 reclaimPolicy: Delete
+allowVolumeExpansion: true