From 04f2261e600f804977a80c1a225b714c42d9de2f Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 21 Jan 2022 12:28:52 +0530 Subject: [PATCH] deploy: support rook deployment for v1.8+ In Rook v1.8+ the path for the deployment articafts are changed from `"cluster/examples/kubernetes/ceph` to `deploy/examples`. Signed-off-by: Madhu Rajanna --- scripts/rook.sh | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/scripts/rook.sh b/scripts/rook.sh index 5b1fa2d60..d89eec366 100755 --- a/scripts/rook.sh +++ b/scripts/rook.sh @@ -2,7 +2,8 @@ ROOK_VERSION=${ROOK_VERSION:-"v1.6.2"} ROOK_DEPLOY_TIMEOUT=${ROOK_DEPLOY_TIMEOUT:-300} -ROOK_URL="https://raw.githubusercontent.com/rook/rook/${ROOK_VERSION}/cluster/examples/kubernetes/ceph" +ROOK_URL="https://raw.githubusercontent.com/rook/rook/${ROOK_VERSION}/" +ROOK_DEPLOYMENT_PATH="cluster/examples/kubernetes/ceph" ROOK_BLOCK_POOL_NAME=${ROOK_BLOCK_POOL_NAME:-"newrbdpool"} ROOK_BLOCK_EC_POOL_NAME=${ROOK_BLOCK_EC_POOL_NAME:-"ec-pool"} @@ -33,6 +34,17 @@ rook_version() { echo "${ROOK_VERSION#v}" | cut -d'.' -f"${1}" } +function update_rook_url() { + ROOK_MAJOR=$(rook_version 1) + ROOK_MINOR=$(rook_version 2) + + # If rook version is => 1.8 update deployment path. + if [ "${ROOK_MAJOR}" -eq 1 ] && [ "${ROOK_MINOR}" -ge 8 ]; then + ROOK_DEPLOYMENT_PATH="deploy/examples" + fi + ROOK_URL+=${ROOK_DEPLOYMENT_PATH} +} + function deploy_rook() { kubectl_retry create -f "${ROOK_URL}/common.yaml" @@ -209,6 +221,9 @@ function check_rbd_stat() { echo "" } +# update rook URL before doing any operation. +update_rook_url + case "${1:-}" in deploy) deploy_rook