Merge pull request #89 from TheNewNormal/v0.4.6

v0.4.6

.travis.yml

@@ -0,0 +1,4 @@
+osx_image: xcode7.3
+language: objective-c
+xcode_project: src/Kube-Cluster.xcodeproj # path to your xcodeproj folder
+xcode_scheme: Kube-Cluster

src/Kube-Cluster.xcodeproj/project.pbxproj

@@ -441,7 +441,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -463,7 +462,6 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				CLANG_ENABLE_OBJC_ARC = YES;
-				CODE_SIGN_IDENTITY = "Developer ID Application";
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Mac Developer";
 				COMBINE_HIDPI_IMAGES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;

src/Kube-Cluster/Kube-Cluster-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.4.5</string>
+	<string>0.4.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>181</string>
+	<string>185</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/first-init.command

@@ -43,6 +43,7 @@ check_internet_from_vm
 
 # install k8s files on to VMs
 install_k8s_files
+echo " "
 #
 
 # download latest version of fleetctl and helmc clients
@@ -53,6 +54,7 @@ download_osx_clients
 export ETCDCTL_PEERS=http://$master_vm_ip:2379
 
 # wait till etcd service is ready
+echo " "
 echo "--------"
 echo "Waiting for etcd service to be ready on master VM..."
 spin='-\|/'
@@ -77,7 +79,8 @@ deploy_fleet_units
 sleep 3
 
 # generate kubeconfig file
-echo Generating kubeconfig file ...
+echo " "
+echo "Generating kubeconfig file ..."
 "${res_folder}"/bin/gen_kubeconfig $master_vm_ip
 #
 
@@ -101,7 +104,7 @@ until ~/kube-cluster/bin/kubectl get nodes | grep -w "k8snode-02" | grep -w "Rea
 echo "..."
 echo " "
 #
-install_k8s_add_ons "$master_vm_ip"
+install_k8s_add_ons
 #
 # attach label to the nodes
 ~/kube-cluster/bin/kubectl label nodes k8snode-01 node=worker1

src/kube-cluster-install.command

@@ -31,7 +31,7 @@
     # copy k8s files
     cp "$1"/k8s/kubectl ~/kube-cluster/kube
     chmod 755 ~/kube-cluster/kube/kubectl
-    cp "$1"/k8s/*.yaml ~/kube-cluster/kubernetes
+    cp "$1"/k8s/add-ons/*.yaml ~/kube-cluster/kubernetes
     # linux binaries
     cp "$1"/k8s/kube.tgz ~/kube-cluster/kube
 

src/up.command

@@ -145,7 +145,7 @@ then
     ~/kube-cluster/bin/kubectl label nodes k8snode-02 node=worker2
     # copy add-ons files
     cp "${res_folder}"/k8s/add-ons/*.yaml ~/kube-cluster/kubernetes
-    install_k8s_add_ons "$master_vm_ip"
+    install_k8s_add_ons
     #
     # remove unfinished_setup file
     rm -f ~/kube-cluster/logs/unfinished_setup > /dev/null 2>&1