From 8eea78d382fe663e357dce60969d125844a5e5cd Mon Sep 17 00:00:00 2001
From: Humble Chirammal <hchiramm@redhat.com>
Date: Wed, 12 May 2021 23:19:39 +0530
Subject: [PATCH] deploy: update Rook version to v1.6.2

Rook v1.6.2 is available and this patch updates the version to the
same:

https://github.com/rook/rook/releases/tag/v1.6.2

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
(cherry picked from commit d56978739f1ff7e948f6ef21378e99f74bd1d8b4)
---
 build.env       |  2 +-
 scripts/rook.sh | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/build.env b/build.env
index f9ceb9435..a8d7d8e12 100644
--- a/build.env
+++ b/build.env
@@ -41,7 +41,7 @@ VM_DRIVER=none
 CHANGE_MINIKUBE_NONE_USER=true
 
 # Rook options
-ROOK_VERSION=v1.4.9
+ROOK_VERSION=v1.6.2
 # Provide ceph image path
 ROOK_CEPH_CLUSTER_IMAGE=docker.io/ceph/ceph:v14.2.12
 
diff --git a/scripts/rook.sh b/scripts/rook.sh
index f3f932c1f..724d21da4 100755
--- a/scripts/rook.sh
+++ b/scripts/rook.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -E
 
-ROOK_VERSION=${ROOK_VERSION:-"v1.4.9"}
+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_BLOCK_POOL_NAME=${ROOK_BLOCK_POOL_NAME:-"newrbdpool"}
@@ -34,6 +34,14 @@ rook_version() {
 
 function deploy_rook() {
         kubectl_retry create -f "${ROOK_URL}/common.yaml"
+
+        # If rook version is > 1.5 , we will apply CRDs.
+        ROOK_MAJOR=$(rook_version 1)
+        ROOK_MINOR=$(rook_version 2)
+        if  [ "${ROOK_MAJOR}" -eq 1 ] && [ "${ROOK_MINOR}" -ge 5 ];
+	  then
+	      kubectl_retry create -f "${ROOK_URL}/crds.yaml"
+	  fi
         kubectl_retry create -f "${ROOK_URL}/operator.yaml"
         # Override the ceph version which rook installs by default.
         if  [ -z "${ROOK_CEPH_CLUSTER_IMAGE}" ]
@@ -44,6 +52,7 @@ function deploy_rook() {
             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" "${TEMP_DIR}"/cluster-test.yaml
+            sed -i "s/config: |/config: |\n    \[mon\]\n    mon_warn_on_insecure_global_id_reclaim_allowed = false/g" "${TEMP_DIR}"/cluster-test.yaml
             cat  "${TEMP_DIR}"/cluster-test.yaml
             kubectl_retry create -f "${TEMP_DIR}/cluster-test.yaml"
             rm -rf "${TEMP_DIR}"
@@ -75,6 +84,12 @@ 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"
 }