From 0125bf62eccd3c29caff5dfb34fd924c48ac846f Mon Sep 17 00:00:00 2001
From: rimas <rmocius@gmail.com>
Date: Tue, 18 Oct 2016 10:25:32 +0100
Subject: [PATCH] v0.9.7

---
 src/Kube-Solo/Kube-Solo-Info.plist                    | 4 ++--
 src/bin/install_deis                                  | 6 +++---
 src/deis/{deis-minio-rc-1.txt => deis-minio-ds-1.txt} | 0
 src/deis/{deis-minio-rc-2.txt => deis-minio-ds-2.txt} | 0
 src/functions.sh                                      | 4 +++-
 src/k8s/kube.tgz                                      | 4 ++--
 src/k8s/kubectl                                       | 4 ++--
 7 files changed, 12 insertions(+), 10 deletions(-)
 rename src/deis/{deis-minio-rc-1.txt => deis-minio-ds-1.txt} (100%)
 rename src/deis/{deis-minio-rc-2.txt => deis-minio-ds-2.txt} (100%)

diff --git a/src/Kube-Solo/Kube-Solo-Info.plist b/src/Kube-Solo/Kube-Solo-Info.plist
index fd2af59..7fc51a1 100644
--- a/src/Kube-Solo/Kube-Solo-Info.plist
+++ b/src/Kube-Solo/Kube-Solo-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.6</string>
+	<string>0.9.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>303</string>
+	<string>305</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/src/bin/install_deis b/src/bin/install_deis
index f616330..9a74399 100755
--- a/src/bin/install_deis
+++ b/src/bin/install_deis
@@ -54,12 +54,12 @@ rm -rf ~/.helmc/workspace/charts/workflow-${WORKFLOW_RELEASE}-kube-solo/tpl/deis
 # run helmc generate
 helmc generate -x manifests workflow-${WORKFLOW_RELEASE}-kube-solo
 
-# update minio RC with persistent volume
+# update minio deployment with persistent volume
 cp "${res_folder}"/deis/* ~/.helmc/workspace/charts/workflow-${WORKFLOW_RELEASE}-kube-solo/manifests
 
 cd ~/.helmc/workspace/charts/workflow-${WORKFLOW_RELEASE}-kube-solo/manifests
-"${res_folder}"/bin/gsed -i '/readOnly: true/ r deis-minio-rc-1.txt' deis-minio-rc.yaml
-cat deis-minio-rc-2.txt >> deis-minio-rc.yaml
+"${res_folder}"/bin/gsed -i '/readOnly: true/ r deis-minio-ds-1.txt' deis-minio-deployment.yaml
+cat deis-minio-ds-2.txt >> deis-minio-deployment.yaml
 rm -f *.txt
 
 # Install Deis
diff --git a/src/deis/deis-minio-rc-1.txt b/src/deis/deis-minio-ds-1.txt
similarity index 100%
rename from src/deis/deis-minio-rc-1.txt
rename to src/deis/deis-minio-ds-1.txt
diff --git a/src/deis/deis-minio-rc-2.txt b/src/deis/deis-minio-ds-2.txt
similarity index 100%
rename from src/deis/deis-minio-rc-2.txt
rename to src/deis/deis-minio-ds-2.txt
diff --git a/src/functions.sh b/src/functions.sh
index 08c7a4e..819c425 100755
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -269,7 +269,7 @@ if [ $MATCH -ne 0 ]; then
 else
     echo " "
     echo "Downloading latest ${LATEST_HELM} of 'helm' cli for macOS"
-    curl -k -L https://github.com/kubernetes/helm/releases/download/$LATEST_HELM/helm-$LATEST_HELM-darwin-amd64.tar.gz > helm.tar.gz
+    curl -k -L http://storage.googleapis.com/kubernetes-helm/helm-${LATEST_HELM}-darwin-amd64.tar.gz > helm.tar.gz
     tar xvf helm.tar.gz -C ~/kube-solo/tmp --strip=1 darwin-amd64/helm > /dev/null 2>&1
     chmod +x helm
     mv -f helm ~/kube-solo/bin/helm
@@ -286,7 +286,9 @@ else
     export KUBECONFIG=~/kube-solo/kube/kubeconfig
     export HELM_HOST=$vm_ip:32767
     echo "Installing new version of Helm Tiller..."
+    kubectl --namespace=kube-system delete deployment tiller-deploy > /dev/null 2>&1
     ~/kube-solo/bin/helm init
+    echo "Helm is ready to sail ..."
 fi
 #
 
diff --git a/src/k8s/kube.tgz b/src/k8s/kube.tgz
index 04b502b..d76c81e 100644
--- a/src/k8s/kube.tgz
+++ b/src/k8s/kube.tgz
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:ab0fe0b047a4caff3db1973d19832174c0b87304e82b0aef0b5ad5a54641db81
-size 106215122
+oid sha256:3e13156d07461db7f2e8abcec4a20d883a63279f923e5188145b1c7cf2e19678
+size 106152669
diff --git a/src/k8s/kubectl b/src/k8s/kubectl
index 3e86720..b8c92b1 100755
--- a/src/k8s/kubectl
+++ b/src/k8s/kubectl
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c9945d10a1c322861796d4ecc3934330b50a8225cdfab33665fbf401d538e7dc
-size 82728656
+oid sha256:7c5cc92f618ebce019b00792621facfa7c1b4fce9f9e7d2c7ac4bc5f0af9e4c9
+size 66382384