github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

Etcd listens on localhost for GCE

Browse Source
This commit is contained in:
Abhishek Shah 2015-04-03 11:40:09 -07:00
parent 76f1232a2e
commit 23c42cd8b2
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cluster/saltbase/salt/etcd/etcd.manifest
View File

@ -1,4 +1,8 @@
{% set ipv4_addr = salt['grains.get']('fqdn_ip4')[0] -%}
{% if grains.cloud is defined and grains.cloud == 'gce' -%}
{% set etcd_addr = "127.0.0.1" -%}
{% else -%}
{% set etcd_addr = salt['grains.get']('fqdn_ip4')[0] -%}
{% endif -%}
{
"apiVersion": "v1beta3",
@ -13,9 +17,9 @@
"command": [
"/usr/local/bin/etcd",
"--addr",
"{{ipv4_addr}}:4001",
"{{etcd_addr}}:4001",
"--bind-addr",
"0.0.0.0:4001",
"{{etcd_addr}}:4001",
"--data-dir",
"/var/etcd/data"
],

7
cluster/saltbase/salt/kube-apiserver/default
View File

@ -31,11 +31,10 @@
{% set publicAddressOverride = "--public_address_override=" + grains.publicAddressOverride -%}
{% endif -%}
{% 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. #}
{% if grains.cloud is defined and grains.cloud == 'gce' -%}
{% set etcd_servers = "--etcd_servers=http://127.0.0.1:4001" -%}
{% elif grains.etcd_servers is defined -%}
{% set etcd_servers = "--etcd_servers=http://" + grains.etcd_servers + ":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" -%}