Merge pull request #43 from TheNewNormal/v0.2.7

v0.2.7
TheNewNormal · Jun 7, 2016 · 4f94967 · 4f94967
2 parents 691a60f + a6e46e1
commit 4f94967
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/Kube-Cluster/Kube-Cluster-Info.plist b/src/Kube-Cluster/Kube-Cluster-Info.plist
@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.6</string>
+	<string>0.2.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>57</string>
+	<string>61</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/bin/corectl b/src/bin/corectl
diff --git a/src/bin/helmc b/src/bin/helmc
diff --git a/src/bin/install_deis b/src/bin/install_deis
@@ -34,16 +34,16 @@ helmc repo add deis https://github.com/deis/charts
 # get the latest version of all Charts from all repos
 helmc up
 # delete the old folder if such exists
-rm -rf ~/.helmc/workspace/charts/workflow-rc1-kube-cluster > /dev/null 2>&1
+rm -rf ~/.helmc/workspace/charts/workflow-rc2-kube-cluster > /dev/null 2>&1
 # fetch Deis Workflow Chart to your helmc's working directory
-helmc fetch deis/workflow-rc1 workflow-rc1-kube-cluster
+helmc fetch deis/workflow-rc2 workflow-rc2-kube-cluster
 # run helmc generate
-helmc generate -x manifests workflow-rc1-kube-cluster
+helmc generate -x manifests workflow-rc2-kube-cluster
 # pin router to node worker1
-echo "      nodeSelector:" >> ~/.helmc/workspace/charts/workflow-rc1-kube-cluster/manifests/deis-router-rc.yaml
-echo "        node: worker1" >> ~/.helmc/workspace/charts/workflow-rc1-kube-cluster/manifests/deis-router-rc.yaml
+echo "      nodeSelector:" >> ~/.helmc/workspace/charts/workflow-rc2-kube-cluster/manifests/deis-router-rc.yaml
+echo "        node: worker1" >> ~/.helmc/workspace/charts/workflow-rc2-kube-cluster/manifests/deis-router-rc.yaml
 # Install Deis PaaS
-helmc install workflow-rc1-kube-cluster
+helmc install workflow-rc2-kube-cluster
 
 # Install deis client
 current_folder=$(pwd)

diff --git a/src/bin/kubectl b/src/bin/kubectl
@@ -1,5 +1,7 @@
 #!/bin/bash
 
-cmd=($HOME/kube-cluster/kube/kubectl --kubeconfig="$HOME/kube-cluster/kube/kubeconfig" "${@+$@}")
+###cmd=($HOME/kube-cluster/kube/kubectl --kubeconfig="$HOME/kube-cluster/kube/kubeconfig" "${@+$@}")
+
+cmd=($HOME/kube-cluster/kube/kubectl --kubeconfig="${KUBE_CONFIG:-$HOME/kube-cluster/kube/kubeconfig}" "${@+$@}")
 
 "${cmd[@]}"