From c9773db3f3e3030d20daf97d8cad4c8498ed19f7 Mon Sep 17 00:00:00 2001
From: Humble Chirammal <hchiramm@redhat.com>
Date: Mon, 1 Aug 2022 21:41:15 +0530
Subject: [PATCH] ci: remove check for snapshot controller installation and
 cleanup

At present, the check is performed to validate the version of kube
is v1.17 and this commit remove the same.

Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
---
 scripts/travis-functest.sh | 17 ++++-------------
 scripts/travis-helmtest.sh | 19 ++++---------------
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/scripts/travis-functest.sh b/scripts/travis-functest.sh
index 44649acab..d86c80de9 100755
--- a/scripts/travis-functest.sh
+++ b/scripts/travis-functest.sh
@@ -27,21 +27,12 @@ sudo scripts/minikube.sh create-block-pool
 # pull docker images to speed up e2e
 sudo scripts/minikube.sh cephcsi
 sudo scripts/minikube.sh k8s-sidecar
-KUBE_MAJOR=$(kube_version 1)
-KUBE_MINOR=$(kube_version 2)
-# skip snapshot operation if kube version is less than 1.17.0
-if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
-    # delete snapshot CRD created by ceph-csi in rook
-    scripts/install-snapshot.sh delete-crd
-    # install snapshot controller
-    scripts/install-snapshot.sh install
-fi
+# install snapshot controller and create snapshot CRD
+scripts/install-snapshot.sh install
 
 # functional tests
 make run-e2e E2E_ARGS="${*}"
 
-if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
-    # delete snapshot CRD
-    scripts/install-snapshot.sh cleanup
-fi
+# cleanup
+scripts/install-snapshot.sh cleanup
 sudo scripts/minikube.sh clean
diff --git a/scripts/travis-helmtest.sh b/scripts/travis-helmtest.sh
index c1cb7b24c..e602152c9 100755
--- a/scripts/travis-helmtest.sh
+++ b/scripts/travis-helmtest.sh
@@ -35,15 +35,8 @@ sudo scripts/minikube.sh k8s-sidecar
 NAMESPACE=cephcsi-e2e-$RANDOM
 # create ns for e2e
 kubectl create ns ${NAMESPACE}
-KUBE_MAJOR=$(kube_version 1)
-KUBE_MINOR=$(kube_version 2)
-# skip snapshot operation if kube version is less than 1.17.0
-if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
-    # delete snapshot CRD created by ceph-csi in rook
-    scripts/install-snapshot.sh delete-crd
-    # install snapshot controller
-    scripts/install-snapshot.sh install
-fi
+# install snapshot controller and create snapshot CRD
+scripts/install-snapshot.sh install
 # set up helm
 scripts/install-helm.sh up
 # install cephcsi helm charts
@@ -51,12 +44,8 @@ scripts/install-helm.sh install-cephcsi --namespace ${NAMESPACE}
 # functional tests
 make run-e2e NAMESPACE="${NAMESPACE}" E2E_ARGS="--deploy-cephfs=false --deploy-rbd=false ${*}"
 
-#cleanup
-# skip snapshot operation if kube version is less than 1.17.0
-if [[ "${KUBE_MAJOR}" -ge 1 ]] && [[ "${KUBE_MINOR}" -ge 17 ]]; then
-    # delete snapshot CRD
-    scripts/install-snapshot.sh cleanup
-fi
+# cleanup
+scripts/install-snapshot.sh cleanup
 scripts/install-helm.sh cleanup-cephcsi --namespace ${NAMESPACE}
 scripts/install-helm.sh clean
 kubectl delete ns ${NAMESPACE}