summaryrefslogtreecommitdiffstats
path: root/src/vagrant/kubeadm_multus
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-11-09 12:35:02 -0500
committerGuo Ruijing <ruijing.guo@intel.com>2017-11-09 13:45:56 -0500
commitd8f85fabb2be5fea3630821bc8a9f186781ce2b9 (patch)
tree545126b15ba3710f204db526a09fe5cb378f971a /src/vagrant/kubeadm_multus
parent5f41686bc6a09307e346bbbf980ab45df7ac9ced (diff)
fix container4nfv jenkins job hung issue
1. fix cleanup: poweroff/delete all vms 2. add timeout for kubeadm init/join hung: https://github.com/kubernetes/kubernetes/issues/43800 3. try to fix kubeadm init/join hung Change-Id: I133d5aafee0455848909484efee5548b2015473d Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'src/vagrant/kubeadm_multus')
-rw-r--r--src/vagrant/kubeadm_multus/host_setup.sh4
-rw-r--r--src/vagrant/kubeadm_multus/master_setup.sh4
-rw-r--r--src/vagrant/kubeadm_multus/worker_setup.sh2
3 files changed, 8 insertions, 2 deletions
diff --git a/src/vagrant/kubeadm_multus/host_setup.sh b/src/vagrant/kubeadm_multus/host_setup.sh
index 003bf2b..d9b68e2 100644
--- a/src/vagrant/kubeadm_multus/host_setup.sh
+++ b/src/vagrant/kubeadm_multus/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_multus/master_setup.sh b/src/vagrant/kubeadm_multus/master_setup.sh
index 7d3dc3e..8170f92 100644
--- a/src/vagrant/kubeadm_multus/master_setup.sh
+++ b/src/vagrant/kubeadm_multus/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_multus/worker_setup.sh b/src/vagrant/kubeadm_multus/worker_setup.sh
index 1ba3ec8..19e1051 100644
--- a/src/vagrant/kubeadm_multus/worker_setup.sh
+++ b/src/vagrant/kubeadm_multus/worker_setup.sh
@@ -1,4 +1,4 @@
#!/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