From fb508575f5e726dd4fe95c69a576e731181446c9 Mon Sep 17 00:00:00 2001
From: Grant Griffiths <grant@portworx.com>
Date: Thu, 17 Oct 2019 15:30:29 -0700
Subject: [PATCH] Remove snapshotclass and snapshotter creation in deploy
 script

---
 .../hostpath/csi-hostpath-plugin.yaml                |  2 +-
 .../hostpath/csi-hostpath-plugin.yaml                |  2 +-
 .../hostpath/csi-hostpath-plugin.yaml                |  2 +-
 deploy/util/deploy-hostpath.sh                       | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/deploy/kubernetes-1.14/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.14/hostpath/csi-hostpath-plugin.yaml
index 22e47b61f..0f552601a 100644
--- a/deploy/kubernetes-1.14/hostpath/csi-hostpath-plugin.yaml
+++ b/deploy/kubernetes-1.14/hostpath/csi-hostpath-plugin.yaml
@@ -63,7 +63,7 @@ spec:
             name: csi-data-dir
 
         - name: hostpath
-          image: quay.io/k8scsi/hostpathplugin:v1.2.0
+          image: quay.io/k8scsi/hostpathplugin:v1.2.0-rc8
           args:
             - "--drivername=hostpath.csi.k8s.io"
             - "--v=5"
diff --git a/deploy/kubernetes-1.15/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.15/hostpath/csi-hostpath-plugin.yaml
index 22e47b61f..0f552601a 100644
--- a/deploy/kubernetes-1.15/hostpath/csi-hostpath-plugin.yaml
+++ b/deploy/kubernetes-1.15/hostpath/csi-hostpath-plugin.yaml
@@ -63,7 +63,7 @@ spec:
             name: csi-data-dir
 
         - name: hostpath
-          image: quay.io/k8scsi/hostpathplugin:v1.2.0
+          image: quay.io/k8scsi/hostpathplugin:v1.2.0-rc8
           args:
             - "--drivername=hostpath.csi.k8s.io"
             - "--v=5"
diff --git a/deploy/kubernetes-1.16/hostpath/csi-hostpath-plugin.yaml b/deploy/kubernetes-1.16/hostpath/csi-hostpath-plugin.yaml
index 22e47b61f..0f552601a 100644
--- a/deploy/kubernetes-1.16/hostpath/csi-hostpath-plugin.yaml
+++ b/deploy/kubernetes-1.16/hostpath/csi-hostpath-plugin.yaml
@@ -63,7 +63,7 @@ spec:
             name: csi-data-dir
 
         - name: hostpath
-          image: quay.io/k8scsi/hostpathplugin:v1.2.0
+          image: quay.io/k8scsi/hostpathplugin:v1.2.0-rc8
           args:
             - "--drivername=hostpath.csi.k8s.io"
             - "--v=5"
diff --git a/deploy/util/deploy-hostpath.sh b/deploy/util/deploy-hostpath.sh
index df20799e8..b37bc5905 100755
--- a/deploy/util/deploy-hostpath.sh
+++ b/deploy/util/deploy-hostpath.sh
@@ -107,10 +107,14 @@ for component in CSI_PROVISIONER CSI_ATTACHER CSI_SNAPSHOTTER CSI_RESIZER; do
     run kubectl apply -f "${current}"
 done
 
-# deploy hostpath plugin and registrar sidecar
+# deploy hostpath plugin and CSI sidecars
 echo "deploying hostpath components"
 for i in $(ls ${BASE_DIR}/hostpath/*.yaml | sort); do
     echo "   $i"
+    if [[ $i == *"snapshotter"* ]] ; then
+        continue
+    fi
+
     modified="$(cat "$i" | while IFS= read -r line; do
         nocomments="$(echo "$line" | sed -e 's/ *#.*$//')"
         if echo "$nocomments" | grep -q '^[[:space:]]*image:[[:space:]]*'; then
@@ -151,7 +155,7 @@ done
 # for: the expectation is that we run attacher, provisioner,
 # snapshotter, resizer, socat and hostpath plugin in the default namespace.
 cnt=0
-while [ $(kubectl get pods 2>/dev/null | grep '^csi-hostpath.* Running ' | wc -l) -lt 5 ] || ! kubectl describe volumesnapshotclasses.snapshot.storage.k8s.io 2>/dev/null >/dev/null; do
+while [ $(kubectl get pods 2>/dev/null | grep '^csi-hostpath.* Running ' | wc -l) -lt 4 ]; do
     if [ $cnt -gt 30 ]; then
         echo "Running pods:"
         kubectl describe pods
@@ -163,7 +167,3 @@ while [ $(kubectl get pods 2>/dev/null | grep '^csi-hostpath.* Running ' | wc -l
     cnt=$(($cnt + 1))
     sleep 10
 done
-
-# deploy snapshotclass
-echo "deploying snapshotclass"
-kubectl apply -f ${BASE_DIR}/snapshotter/csi-hostpath-snapshotclass.yaml