diff --git a/scripts/rook.sh b/scripts/rook.sh index 1286e1341..2c0e4cdaf 100755 --- a/scripts/rook.sh +++ b/scripts/rook.sh @@ -2,8 +2,7 @@ ROOK_VERSION=${ROOK_VERSION:-"v1.6.2"} ROOK_DEPLOY_TIMEOUT=${ROOK_DEPLOY_TIMEOUT:-300} -ROOK_URL="https://raw.githubusercontent.com/rook/rook/${ROOK_VERSION}/" -ROOK_DEPLOYMENT_PATH="cluster/examples/kubernetes/ceph" +ROOK_URL="https://raw.githubusercontent.com/rook/rook/${ROOK_VERSION}/deploy/examples" ROOK_BLOCK_POOL_NAME=${ROOK_BLOCK_POOL_NAME:-"newrbdpool"} ROOK_BLOCK_EC_POOL_NAME=${ROOK_BLOCK_EC_POOL_NAME:-"ec-pool"} @@ -30,31 +29,10 @@ function log_errors() { exit 1 } -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" + kubectl_retry create -f "${ROOK_URL}/crds.yaml" - ROOK_MAJOR=$(rook_version 1) - ROOK_MINOR=$(rook_version 2) - - # If rook version is > 1.5 , we will apply CRDs. - if [ "${ROOK_MAJOR}" -eq 1 ] && [ "${ROOK_MINOR}" -ge 5 ]; then - kubectl_retry create -f "${ROOK_URL}/crds.yaml" - fi TEMP_DIR="$(mktemp -d)" curl -o "${TEMP_DIR}/operator.yaml" "${ROOK_URL}/operator.yaml" # disable rook deployed csi drivers @@ -106,12 +84,8 @@ function teardown_rook() { kubectl delete -f "${ROOK_URL}/toolbox.yaml" kubectl delete -f "${ROOK_URL}/cluster-test.yaml" kubectl delete -f "${ROOK_URL}/operator.yaml" - ROOK_MAJOR=$(rook_version 1) - ROOK_MINOR=$(rook_version 2) - if [ "${ROOK_MAJOR}" -eq 1 ] && [ "${ROOK_MINOR}" -ge 5 ]; then - kubectl delete -f "${ROOK_URL}/crds.yaml" - fi kubectl delete -f "${ROOK_URL}/common.yaml" + kubectl delete -f "${ROOK_URL}/crds.yaml" } function create_block_pool() { @@ -252,9 +226,6 @@ function check_rbd_stat() { echo "" } -# update rook URL before doing any operation. -update_rook_url - case "${1:-}" in deploy) deploy_rook