diff options
| author |   Xuan Jia <jason.jiaxuan@gmail.com> | 2017-11-25 02:37:06 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-25 02:37:06 +0000 |
| commit | b80a6c9558a472fad77ef0aadca201f38cfcc841 (patch) | |
| tree | fa19610bf8b79d5dbd4d750be505adaca9368264 /src/vagrant/kubeadm_virtlet | |
| parent | 07b792f6cbf6e583cb4b5e78c5502201ed61025a (diff) | |
| parent | 410039d2e60e8e00cc9544ab086388b8ffc699f3 (diff) | |
Merge "remove timemout for k8s installation"
Diffstat (limited to 'src/vagrant/kubeadm_virtlet')
| -rw-r--r-- | src/vagrant/kubeadm_virtlet/master_setup.sh | 2 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_virtlet/worker_setup.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/vagrant/kubeadm_virtlet/master_setup.sh b/src/vagrant/kubeadm_virtlet/master_setup.sh index 84185e0..fb0f0c9 100644 --- a/src/vagrant/kubeadm_virtlet/master_setup.sh +++ b/src/vagrant/kubeadm_virtlet/master_setup.sh @@ -2,7 +2,7 @@ set -ex -sudo timeout 600 kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/24 --pod-network-cidr=10.32.0.0/16 --token 8c5adc.1cec8dbf339093f0 +sudo kubeadm init --apiserver-advertise-address=192.168.1.10 --service-cidr=10.96.0.0/24 --pod-network-cidr=10.32.0.0/16 --token 8c5adc.1cec8dbf339093f0 sudo cp /etc/kubernetes/admin.conf $HOME/ sudo chown $(id -u):$(id -g) $HOME/admin.conf export KUBECONFIG=$HOME/admin.conf diff --git a/src/vagrant/kubeadm_virtlet/worker_setup.sh b/src/vagrant/kubeadm_virtlet/worker_setup.sh index 4389770..4472874 100644 --- a/src/vagrant/kubeadm_virtlet/worker_setup.sh +++ b/src/vagrant/kubeadm_virtlet/worker_setup.sh @@ -1,7 +1,7 @@ #!/bin/bash set -ex -sudo timeout 600 kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true +sudo kubeadm join --token 8c5adc.1cec8dbf339093f0 192.168.1.10:6443 || true sudo docker pull openretriever/virtlet sudo docker run --rm openretriever/virtlet tar -c /criproxy | sudo tar -C /usr/local/bin -xv |