diff options
| author |   Guo Ruijing <ruijing.guo@intel.com> | 2018-05-30 19:03:03 +0800 |
|---|---|---|
| committer | Guo Ruijing <ruijing.guo@intel.com> | 2018-05-31 17:43:01 +0800 |
| commit | 6b40a7d85df324b8556c9e4f2916e444dc0ca0a6 (patch) | |
| tree | 830bf7c53a7c902ec230dafe7d1f900ed05d210b /src/vagrant/kubeadm_kata/master_setup.sh | |
| parent | b1f11b54803266384cf0d9e14fcb7204dbcc79a7 (diff) | |
enable kata 1.0 + containerd 1.1
Change-Id: Idbeda8b36d067a7bd27a8ef19184c5bb5a6daa04
Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/vagrant/kubeadm_kata/master_setup.sh')
| -rw-r--r-- | src/vagrant/kubeadm_kata/master_setup.sh | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/vagrant/kubeadm_kata/master_setup.sh b/src/vagrant/kubeadm_kata/master_setup.sh index 41dadf0..3f1177e 100644 --- a/src/vagrant/kubeadm_kata/master_setup.sh +++ b/src/vagrant/kubeadm_kata/master_setup.sh @@ -17,18 +17,16 @@ set -ex -sudo kubeadm init --skip-preflight-checks --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/16 --pod-network-cidr=10.32.0.0/12 --token 8c5adc.1cec8dbf339093f0 +sudo kubeadm init --skip-preflight-checks --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/16 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 mkdir ~/.kube sudo cp /etc/kubernetes/admin.conf .kube/config sudo chown $(id -u):$(id -g) ~/.kube/config -kubectl apply -f http://git.io/weave-kube-1.6 +kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml -r=1 -while [ "$r" -ne "0" ] +r=0 +while [ "$r" -ne "1" ] do sleep 30 - r=$(kubectl get pods -n kube-system | grep weave-net | grep -v Run | wc -l) + r=$(kubectl get pods -n kube-system | grep -v Running | wc -l) done - -sudo systemctl restart crio |