diff --git a/README.md b/README.md index bb73108..a6e5072 100644 --- a/README.md +++ b/README.md @@ -10,9 +10,9 @@ Zero to Kubernetes development environment Also there is [Kube-Cluster for OS X](https://github.com/TheNewNormal/kube-cluster-osx) App (master + 2 nodes) -**Includes** [Helm](https://helm.sh) - The Kubernetes Package Manager +**Includes:** [Helm](https://helm.sh) - The Kubernetes Package Manager -**Includes:** an option from shell to install [Deis open source Workflow PaaS](https://deis.com) beta2 on top of Kubernetes: `$ install_deis` +**Includes:** An option from shell to install [Deis Workflow](https://deis.com) on top of Kubernetes with a simple: `$ install_deis` Kube-Solo App can be used together with [CoreOS VM App](https://github.com/TheNewNormal/coreos-osx) which allows to build Docker containers and has a private local Docker registry v2 which is accessible from Kube-Solo App. @@ -32,7 +32,7 @@ How to install Kube-Solo ----------- - **OS X 10.10.3** Yosemite or later - Mac 2010 or later for this to work. - - **Note:** For the fresh install it is recommended to restart your Mac if you have used VirtualBox based VM, as the VirtualBox sometimes messes up networking. + - **Note:** For the fresh App install it is recommended to restart your Mac if you have used VirtualBox based VM, as the VirtualBox sometimes messes networking up. ###Install: diff --git a/src/Kube-Solo/Kube-Solo-Info.plist b/src/Kube-Solo/Kube-Solo-Info.plist index 03ee03e..cc11147 100644 --- a/src/Kube-Solo/Kube-Solo-Info.plist +++ b/src/Kube-Solo/Kube-Solo-Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5.7 + 0.5.8 CFBundleSignature ???? CFBundleVersion - 171 + 173 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/src/bin/helm b/src/bin/helm index 7d72ad8..813ab9a 100755 Binary files a/src/bin/helm and b/src/bin/helm differ diff --git a/src/bin/install_deis b/src/bin/install_deis index 0534998..f060987 100755 --- a/src/bin/install_deis +++ b/src/bin/install_deis @@ -14,7 +14,7 @@ vm_ip=$("${res_folder}"/bin/corectl q -i k8solo-01) # echo " " echo "If you have installed previous beta version of Deis Workflow PaaS, please uninstall it first" -echo "'$ helm uninstall workflow-beta1 -n deis' as currently upgrade between Workflow betas is not supported yet ..." +echo "'$ helm uninstall workflow-beta2 -n deis' as currently any upgrade between Workflow betas is not supported yet ..." echo " " pause 'Press [Enter] key to continue...' echo " " @@ -34,14 +34,16 @@ helm up helm repo add deis https://github.com/deis/charts # get the latest version of all Charts from all repos helm up +# delete the old folder if such exists +rm -rf ~/.helm/workspace/charts/workflow-beta3-kube-solo > /dev/null 2>&1 # fetch Deis Workflow Chart to your helm's working directory -helm fetch deis/workflow-beta2 +helm fetch deis/workflow-beta3 workflow-beta3-kube-solo # run helm generate -helm generate -x manifests workflow-beta2 +helm generate -x manifests workflow-beta3-kube-solo # update minio rc with persistent volume -cp -f "${res_folder}"/deis/deis-minio-rc.yaml ~/.helm/workspace/charts/workflow-beta2/manifests/deis-minio-rc.yaml -# Install Deis PaaS -helm install workflow-beta2 +cp -f "${res_folder}"/deis/deis-minio-rc.yaml ~/.helm/workspace/charts/workflow-beta3-kube-solo/manifests/deis-minio-rc.yaml +# Install Deis +helm install workflow-beta3-kube-solo # Install deis client current_folder=$(pwd) @@ -55,7 +57,7 @@ echo "To learn more about deis client, execute:" echo "deis -h" echo " " # -echo "Waiting for Deis Workflow PaaS to be ready... but first, coffee! " +echo "Waiting for Deis Workflow to be ready... but first, coffee! " spin='-\|/' i=1 until kubectl --namespace=deis get po | grep [d]eis-builder- | grep "1/1" >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done @@ -75,7 +77,7 @@ deis register deis.$vm_ip.nip.io # add ssh key to Deis PaaS echo " " -echo "Adding ssh key to Deis Workflow PaaS ... " +echo "Adding ssh key to Deis Workflow ... " deis keys:add ~/.ssh/id_rsa.pub echo " " @@ -90,12 +92,11 @@ echo " " cd ~/kube-solo/deis/apps -echo "Deis Workflow PaaS install is completed ..." -echo "Deis Workflow PaaS IP is http://deis.$vm_ip.nip.io " +echo "Deis Workflow install is completed ..." +echo "Deis Workflow IP is http://deis.$vm_ip.nip.io " echo " " echo "Please read how to:" echo "To deploy Applications - http://docs-v2.readthedocs.org/en/latest/using-workflow/deploying-an-application/" echo "To manage Applications - http://docs-v2.readthedocs.org/en/latest/using-workflow/managing-an-application/" -echo "Understanding Deis Workflow PaaS - http://docs-v2.readthedocs.org/en/latest/understanding-workflow/concepts/" +echo "Understanding Deis Workflow - http://docs-v2.readthedocs.org/en/latest/understanding-workflow/concepts/" echo " " - diff --git a/src/deis/deis-minio-rc.yaml b/src/deis/deis-minio-rc.yaml index b6f6aa8..328f766 100644 --- a/src/deis/deis-minio-rc.yaml +++ b/src/deis/deis-minio-rc.yaml @@ -18,7 +18,7 @@ spec: serviceAccount: deis-minio containers: - name: deis-minio - image: quay.io/deis/minio:v2.0.0-beta2 + image: quay.io/deis/minio:v2.0.0-beta3 imagePullPolicy: IfNotPresent env: - name: HEALTH_SERVER_PORT diff --git a/src/first-init.command b/src/first-init.command index 3773b46..0e39268 100755 --- a/src/first-init.command +++ b/src/first-init.command @@ -112,7 +112,7 @@ echo " " echo "You can control this App via status bar icon... " echo " " -echo "Also you can install Deis Workflow PaaS (https://deis.com) beta2 version with 'install_deis' command ..." +echo "Also you can install Deis Workflow (https://deis.com) with 'install_deis' command ..." echo " " cd ~/kube-solo diff --git a/src/k8s/kube.tgz b/src/k8s/kube.tgz index d72bd76..7c7e6c3 100644 Binary files a/src/k8s/kube.tgz and b/src/k8s/kube.tgz differ diff --git a/src/k8s/kubectl b/src/k8s/kubectl index 3c73dcf..0fc9559 100755 Binary files a/src/k8s/kubectl and b/src/k8s/kubectl differ