Merge pull request #5119 from zmerlynn/salt_drones

Change GCE to use standalone Saltstack config

cluster/saltbase/pillar/mine.sls

@@ -1,3 +1,6 @@
+# On GCE, there is no Salt mine. We run standalone.
+{% if grains.cloud != 'gce' -%}
+
 # Allow everyone to see cached values of who sits at what IP
 {% set networkInterfaceName = "eth0" %}
 {% if grains.networkInterfaceName is defined %}
@@ -6,3 +9,5 @@
 mine_functions:
   network.ip_addrs: [{{networkInterfaceName}}]
   grains.items: []
+
+{% endif -%}

cluster/saltbase/salt/kube-apiserver/default

@@ -22,6 +22,9 @@
 
 {% if grains.etcd_servers is defined -%}
   {% set etcd_servers = "--etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
+{% elif grains.cloud == 'gce' -%}
+  {# TODO(zmerlynn): I can't see why this isn't generally applicable, but making this change surgical for now. #}
+  {% set etcd_servers = "--etcd_servers=http://127.0.0.1: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" -%}

cluster/saltbase/salt/kube-controller-manager/default

@@ -21,7 +21,7 @@
 {% if grains.cloud is defined -%}
 {% if grains.cloud == 'gce' -%}
   {% set cloud_provider = "--cloud_provider=gce" -%}
-  {% set machines = "--machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
+  {% set machines = "--machines=" + pillar['gce_node_names'] -%}
 {% endif -%}
 {% if grains.cloud == 'aws' -%}
   {% set cloud_provider = "--cloud_provider=aws" -%}