Merge pull request #8722 from roberthbailey/dead-flags-salt

cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest

-{% set machines = ""-%}
 {% set cluster_name = "" -%}
 {% set cluster_cidr = "" -%}
 {% set allocate_node_cidrs = "" -%}
-{% set minion_regexp = "--minion_regexp=.*" -%}
-{% set sync_nodes = "--sync_nodes=true" -%}
 
-{% if pillar['node_instance_prefix'] is defined -%}
-  {% set minion_regexp = "--minion_regexp='" + pillar['node_instance_prefix'] + ".*'" -%}
-{% endif -%}
-{% if pillar['instance_prefix'] is defined -%}		
-  {% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%}		
+{% if pillar['instance_prefix'] is defined -%}
+  {% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%}
 {% endif -%}
 {% if pillar['cluster_cidr'] is defined and pillar['cluster_cidr'] != "" -%}
   {% set cluster_cidr = "--cluster-cidr=" + pillar['cluster_cidr'] -%}
@@ -22,42 +16,15 @@
 {% set cloud_config = "" -%}
 
 {% if grains.cloud is defined -%}
-{% set cloud_provider = "--cloud_provider=" + grains.cloud -%}
-
-{% set service_account_key = " --service_account_private_key_file=/srv/kubernetes/server.key " -%}
-
-{% if grains.cloud == 'gce' -%}
-  {% if grains.cloud_config is defined -%}
-    {% set cloud_config = "--cloud_config=" + grains.cloud_config -%}
-  {% endif -%}
+  {% set cloud_provider = "--cloud_provider=" + grains.cloud -%}
+  {% set service_account_key = " --service_account_private_key_file=/srv/kubernetes/server.key " -%}
 
-{% elif grains.cloud == 'aws' -%}
-  {% if grains.cloud_config is defined -%}
+  {% if grains.cloud in [ 'aws', 'gce' ] and grains.cloud_config is defined -%}
     {% set cloud_config = "--cloud_config=" + grains.cloud_config -%}
   {% endif -%}
-  {% set machines = "--machines=" + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) -%}
-
-{% elif grains.cloud == 'azure' -%}
-  {% set machines = "--machines=" + salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') -%}
-
-{% elif grains.cloud == 'vsphere' -%}
-  # Collect IPs of minions as machines list.
-  {% set machines= "" -%}
-  {% for addrs in salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').values() -%}
-    {% if loop.first -%}
-      machines="--machines=";
-    {% endif -%}
-    {% set machines = machines + addrs[0] %}
-    {% if not loop.last -%}
-      {% set machines = machines + "," %}
-    {% endif -%}
-  {% endfor -%}
-  {% set minion_regexp = "" -%}
-
-{% endif -%}
 {% endif -%}
 
-{% set params = "--master=127.0.0.1:8080" + " " + machines + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + minion_regexp + " " + cloud_provider  + " " + sync_nodes + " " + cloud_config + service_account_key + pillar['log_level'] -%}
+{% set params = "--master=127.0.0.1:8080" + " " + cluster_name + " " + cluster_cidr + " " + allocate_node_cidrs + " " + cloud_provider  + " " + cloud_config + service_account_key + pillar['log_level'] -%}
 
 {
 "apiVersion": "v1beta3",