Merge pull request #122 from TheNewNormal/v0.9.0

v0.9.0

src/Kube-Solo.xcodeproj/project.pbxproj

@@ -38,9 +38,7 @@
 		1329DEB61BD4FB5F008AA719 /* update_osx_clients_files.command in Resources */ = {isa = PBXBuildFile; fileRef = 1329DEAB1BD4FB5F008AA719 /* update_osx_clients_files.command */; };
 		1329DEB81BD526A3008AA719 /* update_k8s.command in Resources */ = {isa = PBXBuildFile; fileRef = 1329DEB71BD526A3008AA719 /* update_k8s.command */; };
 		1345D2771C57002B000BCBC6 /* change_vm_ram.command in Resources */ = {isa = PBXBuildFile; fileRef = 1345D2761C57002B000BCBC6 /* change_vm_ram.command */; };
-		136C48141D3408EC001B0DA3 /* enable_disable_nfs.command in Resources */ = {isa = PBXBuildFile; fileRef = 136C48131D3408EC001B0DA3 /* enable_disable_nfs.command */; };
 		13BCE1C01BEBC0BD00A1A48E /* update_k8s_version.command in Resources */ = {isa = PBXBuildFile; fileRef = 13BCE1BF1BEBC0BD00A1A48E /* update_k8s_version.command */; };
-		13D9B8671C35B09B00EBB078 /* restore_cloud-init.command in Resources */ = {isa = PBXBuildFile; fileRef = 13D9B8661C35B09B00EBB078 /* restore_cloud-init.command */; };
 		13FE22171C1C40C700F465F1 /* bin in Resources */ = {isa = PBXBuildFile; fileRef = 13FE22161C1C40C700F465F1 /* bin */; };
 		13FE22191C1C410100F465F1 /* cloud-init in Resources */ = {isa = PBXBuildFile; fileRef = 13FE22181C1C410100F465F1 /* cloud-init */; };
 		CA4F6FFF1BE1910A00D87763 /* NSURL+KubeSolo.m in Sources */ = {isa = PBXBuildFile; fileRef = CA4F6FFE1BE1910A00D87763 /* NSURL+KubeSolo.m */; };
@@ -90,9 +88,7 @@
 		1329DEAB1BD4FB5F008AA719 /* update_osx_clients_files.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update_osx_clients_files.command; sourceTree = "<group>"; };
 		1329DEB71BD526A3008AA719 /* update_k8s.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update_k8s.command; sourceTree = "<group>"; };
 		1345D2761C57002B000BCBC6 /* change_vm_ram.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = change_vm_ram.command; sourceTree = "<group>"; };
-		136C48131D3408EC001B0DA3 /* enable_disable_nfs.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = enable_disable_nfs.command; sourceTree = "<group>"; };
 		13BCE1BF1BEBC0BD00A1A48E /* update_k8s_version.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = update_k8s_version.command; sourceTree = "<group>"; };
-		13D9B8661C35B09B00EBB078 /* restore_cloud-init.command */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "restore_cloud-init.command"; sourceTree = "<group>"; };
 		13FE22161C1C40C700F465F1 /* bin */ = {isa = PBXFileReference; lastKnownFileType = folder; path = bin; sourceTree = SOURCE_ROOT; };
 		13FE22181C1C410100F465F1 /* cloud-init */ = {isa = PBXFileReference; lastKnownFileType = folder; path = "cloud-init"; sourceTree = SOURCE_ROOT; };
 		CA4F6FFD1BE1910A00D87763 /* NSURL+KubeSolo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSURL+KubeSolo.h"; sourceTree = "<group>"; };
@@ -213,13 +209,11 @@
 				1329DEA11BD4FB5F008AA719 /* check_vm_status.command */,
 				011BBA3A1A2A842A00AAB35B /* change_release_channel.command */,
 				1345D2761C57002B000BCBC6 /* change_vm_ram.command */,
-				136C48131D3408EC001B0DA3 /* enable_disable_nfs.command */,
 				1329DEA31BD4FB5F008AA719 /* destroy.command */,
 				019410671BE11DFA00723E19 /* kill_VM.command */,
 				1329DEA81BD4FB5F008AA719 /* ssh.command */,
 				01F0282B1A7C54C8008C37AA /* os_shell.command */,
 				1329DEA61BD4FB5F008AA719 /* halt.command */,
-				13D9B8661C35B09B00EBB078 /* restore_cloud-init.command */,
 				13BCE1BF1BEBC0BD00A1A48E /* update_k8s_version.command */,
 				1329DEB71BD526A3008AA719 /* update_k8s.command */,
 				1329DEAB1BD4FB5F008AA719 /* update_osx_clients_files.command */,
@@ -297,7 +291,6 @@
 				01E2854818A6C4E300BC630D /* InfoPlist.strings in Resources */,
 				1329DEAC1BD4FB5F008AA719 /* check_vm_status.command in Resources */,
 				1329DEB51BD4FB5F008AA719 /* up.command in Resources */,
-				136C48141D3408EC001B0DA3 /* enable_disable_nfs.command in Resources */,
 				01D3685918E5C184006510B5 /* icon.icns in Resources */,
 				1329DEB81BD526A3008AA719 /* update_k8s.command in Resources */,
 				1329DEB11BD4FB5F008AA719 /* halt.command in Resources */,
@@ -319,7 +312,6 @@
 				01E2855418A6C4E300BC630D /* MainMenu.xib in Resources */,
 				01F0282C1A7C54C8008C37AA /* os_shell.command in Resources */,
 				1329DEB61BD4FB5F008AA719 /* update_osx_clients_files.command in Resources */,
-				13D9B8671C35B09B00EBB078 /* restore_cloud-init.command in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

src/Kube-Solo/Kube-Solo-Info.plist

@@ -19,11 +19,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.8.9</string>
+	<string>0.9.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>251</string>
+	<string>253</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

src/bin/install_deis

@@ -45,6 +45,15 @@ rm -rf ~/.helmc/workspace/charts/workflow-${WORKFLOW_RELEASE}-kube-solo > /dev/n
 
 # fetch Deis Workflow Chart to your helmc's working directory
 helmc fetch deis/workflow-${WORKFLOW_RELEASE} workflow-${WORKFLOW_RELEASE}-kube-solo
+
+# delete monitoring components to save VM's resources
+rm -rf ~/.helmc/workspace/charts/workflow-${WORKFLOW_RELEASE}-kube-solo/manifests/deis-monitor-* > /dev/null 2>&1
+rm -rf ~/.helmc/workspace/charts/workflow-${WORKFLOW_RELEASE}-kube-solo/tpl/deis-monitor-* > /dev/null 2>&1
+
+# delete workflow-manager components to save VM's resources
+rm -rf ~/.helmc/workspace/charts/workflow-${WORKFLOW_RELEASE}-kube-solo/manifests/deis-workflow-manager-* > /dev/null 2>&1
+rm -rf ~/.helmc/workspace/charts/workflow-${WORKFLOW_RELEASE}-kube-solo/tpl/deis-workflow-manager-* > /dev/null 2>&1
+
 # run helmc generate
 helmc generate -x manifests workflow-${WORKFLOW_RELEASE}-kube-solo
 
@@ -61,6 +70,7 @@ helmc install workflow-${WORKFLOW_RELEASE}-kube-solo
 
 # get lastest macOS deis cli version
 cd ~/kube-solo/bin
+echo " "
 echo "Downloading latest version of Workflow deis cli for macOS"
 curl -o deis https://storage.googleapis.com/workflow-cli/deis-latest-darwin-amd64
 chmod +x deis
@@ -111,5 +121,5 @@ echo "Deis Workflow IP is http://deis.$vm_ip.nip.io "
 echo " "
 echo "Please read docs how to:" 
 echo "To deploy Applications - https://deis.com/docs/workflow/applications/deploying-apps/"
-echo "Understanding Deis Workflow - https://deis.com/docs/workflow/understanding-workflow/concepts/"
+echo "Deis Workflow concepts - https://deis.com/docs/workflow/understanding-workflow/concepts/"
 echo " "

src/bin/ksolo

@@ -24,9 +24,12 @@ ip() {
     echo "$(~/bin/corectl q -i k8solo-01)"
 }
 
+ssh() {
+    ~/bin/corectl ssh k8solo-01
+}
 
 usage() {
-    echo "Usage: ksolo start|stop|status|ip"
+    echo "Usage: ksolo start|stop|status|ip|ssh"
 }
 
 
@@ -43,6 +46,9 @@ case "$1" in
         ip)
                 ip
                 ;;
+        ssh)
+                ssh
+                ;;
         *)
                 usage
                 ;;

src/functions.sh

@@ -135,15 +135,15 @@ function create_data_disk() {
 cd ~/kube-solo/
 echo "  "
 echo "Please type Data disk size in GBs followed by [ENTER]:"
-echo -n "[default is 20]: "
+echo -n "[default is 30]: "
 read disk_size
 if [ -z "$disk_size" ]
 then
     echo " "
-    echo "Creating 20GB sparse disk (QCow2)..."
-    ~/bin/qcow-tool create --size=20GiB data.img
+    echo "Creating 30GB sparse disk (QCow2)..."
+    ~/bin/qcow-tool create --size=30GiB data.img
     echo "-"
-    echo "Created 20GB Data disk"
+    echo "Created 30GB Data disk"
     # create file 'unfinished_setup' so on next boot fresh install gets triggered again !!!
     touch ~/kube-solo/logs/unfinished_setup > /dev/null 2>&1
 else

src/kube-solo-install.command

@@ -21,6 +21,9 @@
     rm -f "$HOME"/kube-solo/bin/gen_kubeconfig
     chmod +x ~/kube-solo/bin/*
 
+    # copy ksolo file to ~/bin
+    cp -f "${res_folder}"/bin/ksolo ~/bin
+
     # copy user-data
     cp -f "$1"/cloud-init/* ~/kube-solo/cloud-init
 

src/settings/k8solo-01.toml

@@ -3,8 +3,8 @@
    channel = "stable"
    volume = "data.img"
    cloud_config = "cloud-init/user-data"
-   cpus = 2
-   memory = 2048
+   cpus = 3
+   memory = 3072
    local = "true"
    offline = "true"
    shared-homedir = "true"

src/up.command

@@ -37,6 +37,9 @@ rsync -r --verbose --exclude 'helmc' "${res_folder}"/bin/* ~/kube-solo/bin/ > /d
 rm -f "$HOME"/kube-solo/bin/gen_kubeconfig
 chmod 755 ~/kube-solo/bin/*
 
+# copy ksolo file to ~/bin
+cp -f "${res_folder}"/bin/ksolo ~/bin
+
 # add ssh key to Keychain
 if ! ssh-add -l | grep -q ssh/id_rsa; then
   ssh-add -K ~/.ssh/id_rsa &>/dev/null
@@ -101,15 +104,6 @@ export DOCKER_HOST=tcp://$vm_ip:2375
 export DOCKER_TLS_VERIFY=
 export DOCKER_CERT_PATH=
 
-# restart etcd2 on VM
-#if [[ "${new_vm}" == "1" ]]
-#then
-#    echo " "
-#    echo "Restarting etcd service on VM ..."
-#    ~/bin/corectl ssh k8solo-01 "sudo systemctl restart etcd2"
-#    sleep 3
-#fi
-
 # wait till etcd service is ready
 echo " "
 echo "Waiting for etcd service to be ready on VM..."
@@ -120,13 +114,6 @@ until curl -o /dev/null http://"$vm_ip":2379 >/dev/null 2>&1; do i=$(( (i+1) %4
 echo "..."
 #
 
-# download docker client
-if [[ "${new_vm}" == "1" ]]
-then
-    #
-    download_docker_client
-fi
-
 # wait for Kubernetes cluster readiness
 echo " "
 echo "Waiting for Kubernetes cluster to be ready. This can take a bit..."