Merge pull request #144 from TheNewNormal/v0.9.7

v0.9.7

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>

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

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
 #