Merge pull request #6422 from ArtfulCoder/local_etcd

Run etcd on localhost for all providers.

cluster/libvirt-coreos/user_data_master.yml

@@ -16,7 +16,7 @@ coreos:
         ExecStart=/opt/kubernetes/bin/kube-apiserver \
         --address=0.0.0.0 \
         --port=8080 \
-        --etcd_servers=${etcd_servers} \
+        --etcd_servers=http://127.0.0.1:4001 \
         --kubelet_port=10250 \
         --portal_net=${PORTAL_NET}
         Restart=always

cluster/libvirt-coreos/util.sh

@@ -191,12 +191,6 @@ function kube-up {
 
   readonly machines=$(join , "${KUBE_MINION_IP_ADDRESSES[@]}")
 
-  etcd_servers=( $MASTER_IP ${MINION_IPS[@]} )
-  for (( i=0; i<${#etcd_servers[@]}; i++ )); do
-    etcd_servers[$i]=http://${etcd_servers[$i]}:4001
-  done
-  etcd_servers=$(join , ${etcd_servers[@]})
-
   local i
   for (( i = 0 ; i <= $NUM_MINIONS ; i++ )); do
     if [[ $i -eq $NUM_MINIONS ]]; then

cluster/saltbase/salt/etcd/etcd.manifest

@@ -1,9 +1,3 @@
-{% if grains.cloud is defined and grains.cloud == 'gce' -%}
-  {% set etcd_addr = "127.0.0.1" -%}
-{% else -%}
-  {% set etcd_addr = salt['grains.get']('fqdn_ip4')[0] -%}
-{% endif -%}
-
 {
 "apiVersion": "v1beta3",
 "kind": "Pod",
@@ -17,9 +11,9 @@
     "command": [
               "/usr/local/bin/etcd",
 	      "--addr",
-	      "{{etcd_addr}}:4001",
+	      "127.0.0.1:4001",
 	      "--bind-addr",
-	      "{{etcd_addr}}:4001",
+	      "127.0.0.1:4001",
 	      "--data-dir",
 	      "/var/etcd/data"
             ],

cluster/saltbase/salt/kube-apiserver/default

@@ -31,14 +31,7 @@
   {% set publicAddressOverride = "--public_address_override=" + grains.publicAddressOverride -%}
 {% endif -%}
 
-{% if grains.cloud is defined and grains.cloud == 'gce' -%}
 {% set etcd_servers = "--etcd_servers=http://127.0.0.1:4001" -%}
-{% elif grains.etcd_servers is defined -%}
-  {% set etcd_servers = "--etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
-{% else -%}
-  {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%}
-  {% set etcd_servers = "--etcd_servers=http://" + ips[0][0] + ":4001" -%}
-{% endif -%}
 
 {% if pillar['portal_net'] is defined -%}
   {% set portal_net = "--portal_net=" + pillar['portal_net'] -%}

cluster/vagrant/provision-master.sh

@@ -77,7 +77,6 @@ grains:
   publicAddressOverride: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
   network_mode: openvswitch
   networkInterfaceName: eth1
-  etcd_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
   api_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
   cloud: vagrant
   roles:

cluster/vagrant/provision-minion.sh

@@ -67,7 +67,6 @@ grains:
   cloud: vagrant
   network_mode: openvswitch
   node_ip: '$(echo "$MINION_IP" | sed -e "s/'/''/g")'
-  etcd_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
   api_servers: '$(echo "$MASTER_IP" | sed -e "s/'/''/g")'
   networkInterfaceName: eth1
   roles: