From eb12e9391097d7208076e7777fe337199c204f61 Mon Sep 17 00:00:00 2001 From: Praveen M Date: Tue, 7 Nov 2023 16:55:13 +0530 Subject: [PATCH] ci: create default subvolumegroup Signed-off-by: Praveen M --- PendingReleaseNotes.md | 2 +- scripts/rook.sh | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 090c96b85148..ab06c8e128c1 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -3,7 +3,7 @@ ## Breaking Changes - Removed the deprecated grpc metrics flag's in [PR](https://github.com/ceph/ceph-csi/pull/4225) - + - Support for pre-creation of cephFS subvolumegroup before creating subvolume is removed in [PR](https://github.com/ceph/ceph-csi/pull/4195) diff --git a/scripts/rook.sh b/scripts/rook.sh index bb02fd854384..5506b6cd2c70 100755 --- a/scripts/rook.sh +++ b/scripts/rook.sh @@ -53,12 +53,17 @@ function deploy_rook() { cat "${TEMP_DIR}"/cluster-test.yaml kubectl_retry create -f "${TEMP_DIR}/cluster-test.yaml" fi - rm -rf "${TEMP_DIR}" kubectl_retry create -f "${ROOK_URL}/toolbox.yaml" kubectl_retry create -f "${ROOK_URL}/filesystem-test.yaml" kubectl_retry create -f "${ROOK_URL}/pool-test.yaml" + # Create the default `csi` subvolumegroup + curl -o "${TEMP_DIR}/subvolumegroup.yaml" "${ROOK_URL}/subvolumegroup.yaml" + sed -i "s|name:.*|name: csi|g" "${TEMP_DIR}/subvolumegroup.yaml" + + rm -rf "${TEMP_DIR}" + # Check if CephCluster is empty if ! kubectl_retry -n rook-ceph get cephclusters -oyaml | grep 'items: \[\]' &>/dev/null; then check_ceph_cluster_health