From 9e0589cf12163b9b3162c26ef216016a0213cbcc Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Thu, 23 Jul 2020 14:18:06 +0530 Subject: [PATCH] ci: fix rook cluster version fetching As part of https://github.com/ceph/ceph-csi/pull/1237/ there was a patching enabled for the ceph cluster deployed, however due to an error in the version fetching logic, the patching was not applied Signed-off-by: Humble Chirammal --- scripts/rook.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/rook.sh b/scripts/rook.sh index 435355535..49e8404bf 100755 --- a/scripts/rook.sh +++ b/scripts/rook.sh @@ -7,7 +7,7 @@ ROOK_BLOCK_POOL_NAME=${ROOK_BLOCK_POOL_NAME:-"newrbdpool"} ROOK_CEPH_CLUSTER_VERSION="v14.2.10" rook_version() { - echo "${ROOK_VERSION#?v}" | cut -d'.' -f"${1}" + echo "${ROOK_VERSION#v}" | cut -d'.' -f"${1}" } function deploy_rook() { @@ -21,8 +21,8 @@ function deploy_rook() { # upgrade ceph cluster version to 14.2.10 to support CephFS snapshot functionalities. TEMP_DIR="$(mktemp -d)" curl -o "${TEMP_DIR}"/cluster-test.yaml "${ROOK_URL}/cluster-test.yaml" - sed -i "s|image.*|${ROOK_CEPH_CLUSTER_VERSION_IMAGE_PATH}|g" cluster-test.yaml - cat cluster-test.yaml + sed -i "s|image.*|${ROOK_CEPH_CLUSTER_VERSION_IMAGE_PATH}|g" "${TEMP_DIR}"/cluster-test.yaml + cat "${TEMP_DIR}"/cluster-test.yaml kubectl create -f "${TEMP_DIR}/cluster-test.yaml" rm -rf "${TEMP_DIR}" else