Merge pull request #5245 from erictune/ubuntu-fix

Ubuntu-distro: Kubelet and kube-proxy talk to apiserver not etcd.

cluster/ubuntu-cluster/configure.sh

@@ -130,6 +130,8 @@ do
     item="$name=http://$i:2380"
     if [ "$ii" == 1 ]; then 
         cluster=$item
+        #record the masterIP for later use.
+        masterIP=$i
     else
         cluster="$cluster,$item"
         if [ "$ii" -gt 2 ]; then
@@ -162,6 +164,8 @@ while true; do
             configEtcd $etcdName $myIP $cluster
             # For minion set MINION IP in default_scripts/kubelet
             sed -i "s/MY_IP/${myIP}/g" default_scripts/kubelet
+            sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kubelet         
+            sed -i "s/MASTER_IP/${masterIP}/g" default_scripts/kube-proxy        
             
             # For master set MINION IPs in kube-controller-manager
 	        minionIPs="$minionIPs,$myIP"

cluster/ubuntu-cluster/default_scripts/kube-proxy

@@ -4,7 +4,7 @@
 # KUBE_PROXY="/opt/bin/kube-proxy"
 
 # Use KUBE_PROXY_OPTS to modify the start/restart options
-KUBE_PROXY_OPTS="--etcd_servers=http://127.0.0.1:4001 \
+KUBE_PROXY_OPTS="--master=http://MASTER_IP:8080 \
 --logtostderr=true"
 
 # Add more envionrment settings used by kube-apiserver here

cluster/ubuntu-cluster/default_scripts/kubelet

@@ -8,7 +8,7 @@
 KUBELET_OPTS="--address=0.0.0.0 \
 --port=10250 \
 --hostname_override=MY_IP \
---etcd_servers=http://127.0.0.1:4001 \
+--api_servers=http://MASTER_IP:8080 \
 --logtostderr=true"
 
 # Add more envionrment settings used by kube-scheduler here

cluster/ubuntu/default_scripts/kube-proxy

@@ -4,7 +4,7 @@
 # KUBE_PROXY="/opt/bin/kube-proxy"
 
 # Use KUBE_PROXY_OPTS to modify the start/restart options
-KUBE_PROXY_OPTS="--etcd_servers=http://127.0.0.1:4001 \
+KUBE_PROXY_OPTS="--master=http://127.0.0.1:8080 \
 --logtostderr=true"
 
 # Add more envionrment settings used by kube-apiserver here

cluster/ubuntu/default_scripts/kubelet

@@ -7,7 +7,7 @@
 KUBELET_OPTS="--address=127.0.0.1 \
 --port=10250 \
 --hostname_override=127.0.0.1 \
---etcd_servers=http://127.0.0.1:4001 \
+--api_servers=http://127.0.0.1:8080 \
 --logtostderr=true"
 
 # Add more envionrment settings used by kube-scheduler here