diff options
| author |   Xuan Jia <jason.jiaxuan@gmail.com> | 2017-11-10 03:31:43 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-11-10 03:31:43 +0000 |
| commit | c3b994bd12c09311cff459dbb18f64bf1d1eabab (patch) | |
| tree | efd1d3290e49f6d07648b0a7ec0367fd09d1324f /src/vagrant/kubeadm_virtlet | |
| parent | 7272576f8f2b847f92d44c22282f660d2076ba00 (diff) | |
| parent | d8f85fabb2be5fea3630821bc8a9f186781ce2b9 (diff) | |
Merge "fix container4nfv jenkins job hung issue"
Diffstat (limited to 'src/vagrant/kubeadm_virtlet')
| -rw-r--r-- | src/vagrant/kubeadm_virtlet/host_setup.sh | 4 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_virtlet/master_setup.sh | 4 | ||||
| -rw-r--r-- | src/vagrant/kubeadm_virtlet/worker_setup.sh | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/vagrant/kubeadm_virtlet/host_setup.sh b/src/vagrant/kubeadm_virtlet/host_setup.sh index 003bf2b..d9b68e2 100644 --- a/src/vagrant/kubeadm_virtlet/host_setup.sh +++ b/src/vagrant/kubeadm_virtlet/host_setup.sh @@ -17,4 +17,8 @@ EOF sudo apt-get update sudo apt-get install -y docker.io sudo apt-get install -y --allow-downgrades kubelet=1.7.0-00 kubeadm=1.7.0-00 kubectl=1.7.0-00 kubernetes-cni=0.5.1-00 + sudo rm -rf /var/lib/kubelet +sudo systemctl stop kubelet +sudo systemctl daemon-reload +sudo systemctl start kubelet diff --git a/src/vagrant/kubeadm_virtlet/master_setup.sh b/src/vagrant/kubeadm_virtlet/master_setup.sh index 5ae2487..8831782 100644 --- a/src/vagrant/kubeadm_virtlet/master_setup.sh +++ b/src/vagrant/kubeadm_virtlet/master_setup.sh @@ -1,6 +1,8 @@ #!/bin/bash -sudo kubeadm init --apiserver-advertise-address=10.96.0.10 --service-cidr=10.96.0.0/24 --pod-network-cidr=10.244.0.0/16 --token 8c5adc.1cec8dbf339093f0 +set -ex + +sudo timeout 3600 kubeadm init --apiserver-advertise-address=10.96.0.10 --service-cidr=10.96.0.0/24 --pod-network-cidr=10.244.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 bc28dab..b250350 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 kubeadm join --token 8c5adc.1cec8dbf339093f0 10.96.0.10:6443 || true +sudo timeout 3600 kubeadm join --token 8c5adc.1cec8dbf339093f0 10.96.0.10:6443 || true sudo docker run --rm openretriever/virtlet tar -c /criproxy | sudo tar -C /usr/local/bin -xv sudo ln -s /usr/local/bin/criproxy /usr/local/bin/dockershim |