Merge pull request #132 from TheNewNormal/v0.9.5

v0.9.5
TheNewNormal · Sep 16, 2016 · 78d930a · 78d930a
2 parents 10bbf5b + 0f78fa7
commit 78d930a
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/src/Kube-Solo.xcodeproj/project.pbxproj b/src/Kube-Solo.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 47;
+	objectVersion = 48;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -263,7 +263,7 @@
 				};
 			};
 			buildConfigurationList = 01E2853518A6C4E300BC630D /* Build configuration list for PBXProject "Kube-Solo" */;
-			compatibilityVersion = "Xcode 6.3";
+			compatibilityVersion = "Xcode 8.0";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (

diff --git a/...roj/project.xcworkspace/xcuserdata/rmocevicius.xcuserdatad/UserInterfaceState.xcuserstate b/...roj/project.xcworkspace/xcuserdata/rmocevicius.xcuserdatad/UserInterfaceState.xcuserstate
diff --git 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.4</string>
+	<string>0.9.5</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>297</string>
+	<string>299</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

diff --git a/src/os_shell.command b/src/os_shell.command
@@ -21,13 +21,18 @@ export PATH=${HOME}/kube-solo/bin:$PATH
 # set etcd endpoint
 export ETCDCTL_PEERS=http://$vm_ip:2379
 
+# set kubernetes master endpoint
+export KUBERNETES_MASTER=http://$vm_ip:8080
+
+# set kubernetes cluster config file path for k8s API and Helm
+export KUBECONFIG=~/kube-solo/kube/kubeconfig
+export HELM_HOST=$vm_ip:32767
+
 # docker daemon
 export DOCKER_HOST=tcp://$vm_ip:2375
 export DOCKER_TLS_VERIFY=
 export DOCKER_CERT_PATH=
 
-# set kubernetes master endpoint
-export KUBERNETES_MASTER=http://$vm_ip:8080
 echo " "
 echo "kubectl get nodes:"
 kubectl get nodes