From b7c1b7eed2e25e779994019706e27364bcf0ff12 Mon Sep 17 00:00:00 2001 From: Mark Lamourine Date: Tue, 5 May 2015 20:46:39 +0000 Subject: [PATCH] Added port 6443 to kube-proxy default IP address for api-server added api_servers_with_port variable and settings. removed extra port string split azure api_server host and port out --- cluster/saltbase/salt/kube-proxy/default | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/cluster/saltbase/salt/kube-proxy/default b/cluster/saltbase/salt/kube-proxy/default index b19a6fc4071..1470ab19944 100644 --- a/cluster/saltbase/salt/kube-proxy/default +++ b/cluster/saltbase/salt/kube-proxy/default @@ -5,7 +5,8 @@ {# TODO(azure-maintainer): add support for distributing kubeconfig with token to kube-proxy #} {# so it can use https #} {% if grains['cloud'] is defined and grains['cloud'] == 'azure' -%} - {% set api_servers = "--master=http://" + ips[0][0] + ":7080" -%} + {% set api_servers = "--master=http://" + ips[0][0] -%} + {% set api_servers_with_port = api_servers + ":7080" -%} {% set kubeconfig = "" -%} {% else -%} {% set kubeconfig = "--kubeconfig=/var/lib/kube-proxy/kubeconfig" -%} @@ -15,5 +16,13 @@ {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%} {% set api_servers = "--master=https://" + ips[0][0] -%} {% endif -%} + + # TODO: remove nginx for other cloud providers. + {% if grains['cloud'] is defined and grains.cloud in [ 'aws', 'gce' ] %} + {% set api_servers_with_port = api_servers -%} + {% else -%} + {% set api_servers_with_port = api_servers + ":6443" -%} + {% endif -%} + {% endif -%} -DAEMON_ARGS="{{daemon_args}} {{api_servers}} {{kubeconfig}} {{pillar['log_level']}}" +DAEMON_ARGS="{{daemon_args}} {{api_servers_with_port}} {{kubeconfig}} {{pillar['log_level']}}"