From 65b38e7af76a8273940c3d3336bc1d2e03a94f0d Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Tue, 2 Dec 2014 11:01:24 -0800 Subject: [PATCH] Use apiserver instead of etcd for kube-proxy. For cloud-providers that use salt, have kube-proxy use apiserver instead of etcd as a config source. --- cluster/saltbase/salt/kube-proxy/default | 8 ++++---- cluster/vagrant/provision-master.sh | 1 + cluster/vagrant/provision-minion.sh | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cluster/saltbase/salt/kube-proxy/default b/cluster/saltbase/salt/kube-proxy/default index 013dfd2db59..0e07435040d 100644 --- a/cluster/saltbase/salt/kube-proxy/default +++ b/cluster/saltbase/salt/kube-proxy/default @@ -2,11 +2,11 @@ {% if grains['os_family'] == 'RedHat' -%} {% set daemon_args = "" -%} {% endif -%} -{% if grains.etcd_servers is defined -%} - {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%} +{% if grains.api_servers is defined -%} + {% set api_servers = "-master=http://" + grains.api_servers + ":7080" -%} {% else -%} {% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%} - {% set etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%} + {% set api_servers = "-master=http://" + ips[0][0] + ":7080" -%} {% endif -%} -DAEMON_ARGS="{{daemon_args}} {{etcd_servers}}" +DAEMON_ARGS="{{daemon_args}} {{api_servers}}" diff --git a/cluster/vagrant/provision-master.sh b/cluster/vagrant/provision-master.sh index 71b404ffdf3..b221ce883f7 100755 --- a/cluster/vagrant/provision-master.sh +++ b/cluster/vagrant/provision-master.sh @@ -72,6 +72,7 @@ grains: network_mode: openvswitch networkInterfaceName: eth1 etcd_servers: $MASTER_IP + api_servers: $MASTER_IP cloud: vagrant cloud_provider: vagrant roles: diff --git a/cluster/vagrant/provision-minion.sh b/cluster/vagrant/provision-minion.sh index 24e36f0aff8..05e6ae5e869 100755 --- a/cluster/vagrant/provision-minion.sh +++ b/cluster/vagrant/provision-minion.sh @@ -48,6 +48,7 @@ grains: network_mode: openvswitch node_ip: $MINION_IP etcd_servers: $MASTER_IP + api_servers: $MASTER_IP networkInterfaceName: eth1 apiservers: $MASTER_IP roles: