Merge pull request kubernetes#13609 from ZJU-SEL/deprecate-multiple-etcd-ubuntu

Auto commit by PR queue bot

Author: k8s-merge-robot

cluster/ubuntu/build.sh

@@ -51,7 +51,6 @@ if [ ! -f etcd.tar.gz ] ; then
   tar xzf etcd.tar.gz
 fi
 cp $ETCD/etcd $ETCD/etcdctl binaries/master
-cp $ETCD/etcd $ETCD/etcdctl binaries/minion
 
 # k8s
 echo "Download kubernetes release ..."

cluster/ubuntu/minion/init_conf/etcd.conf

@@ -3,10 +3,9 @@ author "@chenxingyu"
 
 respawn
 
-# start in conjunction with etcd
-start on started etcd
-stop on stopping etcd
-
+start on (net-device-up
+          and local-filesystems
+          and runlevel [2345])
 pre-start script
 	FLANNEL=/opt/bin/$UPSTART_JOB
 	if [ -f /etc/default/$UPSTART_JOB ]; then

cluster/ubuntu/minion/init_conf/flanneld.conf

@@ -3,9 +3,9 @@ author "@jainvipin"
 
 respawn
 
-# start in conjunction with etcd
-start on started etcd
-stop on stopping etcd
+# start in conjunction with flanneld
+start on started flanneld
+stop on stopping flanneld
 
 limit nofile 65536 65536
 

cluster/ubuntu/minion/init_conf/kube-proxy.conf

@@ -3,9 +3,9 @@ author "@jainvipin"
 
 respawn
 
-# start in conjunction with etcd
-start on started etcd
-stop on stopping etcd
+# start in conjunction with flanneld
+start on started flanneld
+stop on stopping flanneld
 
 pre-start script
 	# see also https://github.com/jainvipin/kubernetes-ubuntu-start

cluster/ubuntu/minion/init_conf/kubelet.conf

@@ -24,7 +24,7 @@ KUBELET=/opt/bin/$BASE
 KUBELET_PIDFILE=/var/run/$BASE.pid
 KUBELET_LOGFILE=/var/log/$BASE.log
 KUBELET_OPTS=""
-KUBELET_DESC="Kube-Apiserver"
+KUBELET_DESC="Kubelet"
 
 # Get lsb functions
 . /lib/lsb/init-functions

cluster/ubuntu/minion/init_scripts/etcd

@@ -21,33 +21,48 @@ if [ "$(id -u)" != "0" ]; then
   exit 1
 fi
 
-source ~/kube/config-default.sh
-
-attempt=0
-while true; do
-  /opt/bin/etcdctl get /coreos.com/network/config
-  if [[ "$?" == 0 ]]; then
-    break
-  else
-  	# enough timeout??
-    if (( attempt > 600 )); then
-      echo "timeout for waiting network config" > ~/kube/err.log
-      exit 2
+
+function config_etcd {
+
+  source ~/kube/config-default.sh
+
+  attempt=0
+  while true; do
+    /opt/bin/etcdctl get /coreos.com/network/config
+    if [[ "$?" == 0 ]]; then
+      break
+    else
+    	# enough timeout??
+      if (( attempt > 600 )); then
+        echo "timeout for waiting network config" > ~/kube/err.log
+        exit 2
+      fi
+
+      /opt/bin/etcdctl mk /coreos.com/network/config "{\"Network\":\"${FLANNEL_NET}\"}"
+      attempt=$((attempt+1))
+      sleep 3
     fi
+  done
+}
 
-    /opt/bin/etcdctl mk /coreos.com/network/config "{\"Network\":\"${FLANNEL_NET}\"}"
-    attempt=$((attempt+1))
-    sleep 3
-  fi
-done
+function restart_docker {
+  #wait some secs for /run/flannel/subnet.env ready
+  sleep 15
+  sudo ip link set dev docker0 down
+  sudo brctl delbr docker0
 
-#wait some secs for /run/flannel/subnet.env ready
-sleep 15
-sudo ip link set dev docker0 down
-sudo brctl delbr docker0
+  source /run/flannel/subnet.env
 
-source /run/flannel/subnet.env
+  echo DOCKER_OPTS=\"${DOCKER_OPTS} -H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock \
+       --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU}\" > /etc/default/docker
+  sudo service docker restart
+}
 
-echo DOCKER_OPTS=\"${DOCKER_OPTS} -H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock \
-     --bip=${FLANNEL_SUBNET} --mtu=${FLANNEL_MTU}\" > /etc/default/docker
-sudo service docker restart
+if [[ $1 == "i" ]]; then
+  restart_docker
+elif [[ $1 == "ai" ]]; then
+  config_etcd
+  restart_docker
+elif [[ $1 == "a" ]]; then
+  config_etcd
+fi