diff --git a/docs/devel-quick-start.md b/docs/devel-quick-start.md index 582cf38b7..3b5d85ad2 100644 --- a/docs/devel-quick-start.md +++ b/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 ` 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 diff --git a/docs/krp.md b/docs/krp.md index 06cd9e6ea..abf549c05 100644 --- a/docs/krp.md +++ b/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 diff --git a/hack/commit-msg b/hack/commit-msg new file mode 100755 index 000000000..e48f38ac7 --- /dev/null +++ b/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" diff --git a/hack/install-setup-envtest.sh b/hack/install-setup-envtest.sh index 6d1c30cc4..96b646fdb 100755 --- a/hack/install-setup-envtest.sh +++ b/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" diff --git a/internal/controller/kubeobjects/velero/requests.go b/internal/controller/kubeobjects/velero/requests.go index a0dbbfb30..4c46e1eb3 100644 --- a/internal/controller/kubeobjects/velero/requests.go +++ b/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 diff --git a/test/addons/argocd/test b/test/addons/argocd/test index df1ed6d5e..7653e9629 100755 --- a/test/addons/argocd/test +++ b/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): diff --git a/test/addons/rook-pool/storage-class.yaml b/test/addons/rook-pool/storage-class.yaml index 36a077b7b..77ec8cc6b 100644 --- a/test/addons/rook-pool/storage-class.yaml +++ b/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