diff --git a/README.md b/README.md index 9ecfe0d..ca9b9e9 100644 --- a/README.md +++ b/README.md @@ -6,12 +6,6 @@ CoreOS-Vagrant Kubernetes Cluster GUI for OS X Fully supports etcd2 in all CoresOS channels. -####Note: OS X El Capitan: - -* If you do a fresh install OS X El Capitan support will be enabled - -* Otherwise run: `ln -s /opt/vagrant/bin/vagrant /usr/local/bin/vagrant >/dev/null 2>&1` - [CoreOS](https://coreos.com) is a Linux distribution made specifically to run [Docker](https://www.docker.io/) containers. [CoreOS-Vagrant](https://github.com/coreos/coreos-vagrant) is made to run on VirtualBox and VMWare VMs. diff --git a/src/CoreOS k8s Cluster/CoreOS k8s Cluster-Info.plist b/src/CoreOS k8s Cluster/CoreOS k8s Cluster-Info.plist index fe802ae..e510fe7 100644 --- a/src/CoreOS k8s Cluster/CoreOS k8s Cluster-Info.plist +++ b/src/CoreOS k8s Cluster/CoreOS k8s Cluster-Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.5.1 + 0.5.2 CFBundleSignature ???? CFBundleVersion - 157 + 159 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/src/first-init.command b/src/first-init.command index 90f94d2..d9297bb 100755 --- a/src/first-init.command +++ b/src/first-init.command @@ -190,23 +190,23 @@ spin='-\|/' i=0 until ~/coreos-k8s-cluster/bin/kubectl version 2>/dev/null | grep 'Server Version' >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done i=0 -until ~/coreos-k8s-cluster/bin/kubectl get nodes 2>/dev/null | grep 172.17.15.102 >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done +until ~/coreos-k8s-cluster/bin/kubectl get nodes 2>/dev/null | grep ' Ready' >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done i=0 -until ~/coreos-k8s-cluster/bin/kubectl get nodes 2>/dev/null | grep 172.17.15.103 >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done +until ~/coreos-k8s-cluster/bin/kubectl get nodes 2>/dev/null | grep ' Ready' >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done # attach label to the nodes ~/coreos-k8s-cluster/bin/kubectl label nodes 172.17.15.102 node=worker1 ~/coreos-k8s-cluster/bin/kubectl label nodes 172.17.15.103 node=worker2 # -echo " " -echo "Creating kube-system namespace..." +#echo " " +#echo "Creating kube-system namespace..." # use kubectl to create kube-system namespace, this namespace is expected in versions of kubernetes > 1.02 -~/coreos-k8s-cluster/bin/kubectl create -f - </dev/null 2>&1; do printf "\b${spin:i++%${#sp}:1}"; sleep .1; done i=0 -until ~/coreos-k8s-cluster/bin/kubectl get nodes | grep 172.17.15.102 >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done +until ~/coreos-k8s-cluster/bin/kubectl get nodes | grep ' Ready' >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done i=0 -until ~/coreos-k8s-cluster/bin/kubectl get nodes | grep 172.17.15.103 >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done +until ~/coreos-k8s-cluster/bin/kubectl get nodes | grep ' Ready' >/dev/null 2>&1; do i=$(( (i+1) %4 )); printf "\r${spin:$i:1}"; sleep .1; done # echo " " echo "k8s nodes list:"