From d4d94cb82aab58b3c116c25bedd1e445425e64f0 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng@yasker.org>
Date: Thu, 23 Aug 2018 14:22:08 -0700
Subject: [PATCH] Sync with Longhorn manager

commit ad90204cc69512b1ed3c0b544d088fa22ebbb5ce
Author: Sheng Yang <sheng@yasker.org>
Date:   Thu Aug 23 14:12:21 2018 -0700

    Update image to rancher/longhorn-manager:v0.3.0

    Engine image: rancher/longhorn-engine:v0.3.0

    UI Image: rancher/longhorn-ui:v0.3.0
---
 deploy/longhorn.yaml         | 14 +++++++-------
 scripts/environment_check.sh |  8 +++++---
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
index 6e90798..82a16b6 100644
--- a/deploy/longhorn.yaml
+++ b/deploy/longhorn.yaml
@@ -178,7 +178,7 @@ spec:
     spec:
       containers:
       - name: longhorn-manager
-        image: rancher/longhorn-manager:v0.3-rc5
+        image: rancher/longhorn-manager:v0.3.0
         imagePullPolicy: Always
         securityContext:
           privileged: true
@@ -187,9 +187,9 @@ spec:
         - -d
         - daemon
         - --engine-image
-        - rancher/longhorn-engine:v0.3-rc5
+        - rancher/longhorn-engine:v0.3.0
         - --manager-image
-        - rancher/longhorn-manager:v0.3-rc5
+        - rancher/longhorn-manager:v0.3.0
         - --service-account
         - longhorn-service-account
         ports:
@@ -266,7 +266,7 @@ spec:
     spec:
       containers:
       - name: longhorn-ui
-        image: rancher/longhorn-ui:v0.3-rc5
+        image: rancher/longhorn-ui:v0.3.0
         ports:
         - containerPort: 8000
         env:
@@ -305,18 +305,18 @@ spec:
     spec:
       initContainers:
         - name: wait-longhorn-manager
-          image: rancher/longhorn-manager:v0.3-rc5
+          image: rancher/longhorn-manager:v0.3.0
           command: ['sh', '-c', 'while [ $(curl -m 1 -s -o /dev/null -w "%{http_code}" http://longhorn-backend:9500/v1) != "200" ]; do echo waiting; sleep 2; done']
       containers:
         - name: longhorn-driver-deployer
-          image: rancher/longhorn-manager:v0.3-rc5
+          image: rancher/longhorn-manager:v0.3.0
           imagePullPolicy: Always
           command:
           - longhorn-manager
           - -d
           - deploy-driver
           - --manager-image
-          - rancher/longhorn-manager:v0.3-rc5
+          - rancher/longhorn-manager:v0.3.0
           - --manager-url
           - http://longhorn-backend:9500/v1
           # manually choose "flexvolume" or "csi"
diff --git a/scripts/environment_check.sh b/scripts/environment_check.sh
index 84eb41a..3d00936 100755
--- a/scripts/environment_check.sh
+++ b/scripts/environment_check.sh
@@ -99,6 +99,7 @@ EOF
 }
 
 cleanup() {
+  echo "cleaning up detection workloads..."
   kubectl delete -f $TEMP_DIR/environment_check.yaml &
   a=$!
   kubectl delete -f $TEMP_DIR/detect-flexvol-dir.yaml &
@@ -106,6 +107,7 @@ cleanup() {
   wait $a
   wait $b
   rm -rf $TEMP_DIR
+  echo "clean up completed"
 }
 
 wait_pod_ready() {
@@ -125,7 +127,7 @@ wait_pod_ready() {
 
 validate_pod() {
   flexvol_path=$(kubectl logs detect-flexvol-dir)
-  echo -e "\n  FlexVolume Path: ${flexvol_path}\n"
+  echo -e "\n  FLEXVOLUME_DIR=\"${flexvol_path}\"\n"
 }
 
 wait_ds_ready() {
@@ -147,7 +149,7 @@ wait_ds_ready() {
 validate_ds() {
   local allSupported=true
   local pods=$(kubectl -l app=longhorn-environment-check get po -o json)
-  
+
   for ((i=0; i<1; i++)); do
     local pod=$(echo $pods | jq .items[$i])
     local nodeName=$(echo $pod | jq -r .spec.nodeName)
@@ -162,7 +164,7 @@ validate_ds() {
   if [ "$allSupported" != "true" ]; then
     echo
     echo "  MountPropagation is disabled on at least one node."
-    echo "  As a result, CSI Driver and Base Image aren't supported."
+    echo "  As a result, CSI driver and Base image cannot be supported."
     echo
     exit 1
   else