github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2735 from erictune/proxy_no_etcd

Browse Source 
Use apiserver instead of etcd for kube-proxy.
This commit is contained in:
Brendan Burns 2014-12-09 15:27:20 -08:00
commit 3a7dd589d5
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cluster/saltbase/salt/kube-proxy/default
View File

@ -2,11 +2,11 @@
{% if grains['os_family'] == 'RedHat' -%} {% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" -%} {% set daemon_args = "" -%}
{% endif -%} {% endif -%}
{% if grains.etcd_servers is defined -%} {% if grains.api_servers is defined -%}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%} {% set api_servers = "-master=http://" + grains.api_servers + ":7080" -%}
{% else -%} {% else -%}
{% set ips = salt['mine.get']('roles:kubernetes-master', 'network.ip_addrs', 'grain').values() -%} {% 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 -%} {% endif -%}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}}" DAEMON_ARGS="{{daemon_args}} {{api_servers}}"

1
cluster/vagrant/provision-master.sh
View File

@ -72,6 +72,7 @@ grains:
network_mode: openvswitch network_mode: openvswitch
networkInterfaceName: eth1 networkInterfaceName: eth1
etcd_servers: $MASTER_IP etcd_servers: $MASTER_IP
api_servers: $MASTER_IP
cloud: vagrant cloud: vagrant
cloud_provider: vagrant cloud_provider: vagrant
roles: roles:

1
cluster/vagrant/provision-minion.sh
View File

@ -48,6 +48,7 @@ grains:
network_mode: openvswitch network_mode: openvswitch
node_ip: $MINION_IP node_ip: $MINION_IP
etcd_servers: $MASTER_IP etcd_servers: $MASTER_IP
api_servers: $MASTER_IP
networkInterfaceName: eth1 networkInterfaceName: eth1
apiservers: $MASTER_IP apiservers: $MASTER_IP
roles: roles: