Merge pull request #24324 from zjmchn/fix-vagrant-halt-up-issue

Automatic merge from submit-queue

fix ./cluster/kube-up.sh failed after vagrant halt. (issue #18990)

cluster/vagrant/provision-network-master.sh

@@ -36,6 +36,11 @@ ETCD_INITIAL_ADVERTISE_PEER_URLS="http://${MASTER_IP}:4380"
 ETCD_INITIAL_CLUSTER="flannel=http://${MASTER_IP}:4380"
 ETCD_ADVERTISE_CLIENT_URLS="${FLANNEL_ETCD_URL}"
 EOF
+
+    # fix the etcd boot failure issue
+    sed -i '/^Restart/a RestartSec=10' /usr/lib/systemd/system/etcd.service
+    systemctl daemon-reload
+
     # Enable and start etcd
     systemctl enable etcd
     systemctl start etcd

cluster/vagrant/provision-node.sh

@@ -61,9 +61,17 @@ fi
 
 write-salt-config kubernetes-pool
 
-create-salt-kubelet-auth
-create-salt-kubeproxy-auth
+# Generate kubelet and kube-proxy auth file(kubeconfig) if there is not an existing one
+known_kubeconfig_file="/srv/salt-overlay/salt/kubelet/kubeconfig"
+if [[ ! -f "${known_kubeconfig_file}" ]]; then
+  create-salt-kubelet-auth
+  create-salt-kubeproxy-auth
+else
+  # stop kubelet, let salt start it later
+  systemctl stop kubelet
+fi
 
 install-salt
 
 run-salt
+