diff --git a/vagrant/kubernetes/provision-kube1.sh b/vagrant/kubernetes/provision-kube1.sh index a653b62f..eaba89d4 100755 --- a/vagrant/kubernetes/provision-kube1.sh +++ b/vagrant/kubernetes/provision-kube1.sh @@ -33,39 +33,40 @@ pushd /vagrant # should already be in the vagrant dir if ! [ -f calico.yaml ]; then - timestamp "fetching calico.yaml:" + timestamp "Fetching calico.yaml:" wget https://docs.projectcalico.org/manifests/calico.yaml fi echo >&2 -timestamp "bootstrapping kubernetes master:" -echo >&2 - if ! netstat -lnt | grep -q :10248; then + timestamp "Bootstrapping kubernetes master:" + echo >&2 # remove stale old generated join script so kube2 awaits new one rm -fv "$kubeadm_join" - + echo >&2 # kubeadm-config.yml is in vagrant dir mounted at /vagrant kubeadm init --node-name "$(hostname -f)" --config=kubeadm-config.yaml --upload-certs | tee /vagrant/logs/kubeadm-init.out # save output for review + echo >&2 fi -echo >&2 - kubeadm token list echo >&2 -if ! [ -f ~/.kube/config ]; then - timestamp "configuring kubectl:" - mkdir -pv ~/.kube /vagrant/.kube - cp -i /etc/kubernetes/admin.conf ~/.kube/config - chown "$(id -u):$(id -g)" ~/.kube/config - cp ~/.kube/config /vagrant/.kube/config - echo >&2 -fi +timestamp "Configuring kubectl:" +mkdir -pv ~/.kube /home/vagrant/.kube /vagrant/.kube +for kube_config in ~/.kube/config /home/vagrant/.kube/config; do + if ! [ -f "$kube_config" ]; then + cp -vf /etc/kubernetes/admin.conf "$kube_config" + fi +done +chown -v "$(id -u):$(id -g)" ~/.kube/config +chown -v vagrant:vagrant /home/vagrant/.kube/config +cp -vf ~/.kube/config /vagrant/.kube/config +echo >&2 -timestamp "applying calico.yaml:" +timestamp "Applying calico.yaml:" kubectl apply -f calico.yaml echo >&2