Skip to content

K
k3s
Commit 91b31c55 authored by Daniel Smith's avatar Daniel Smith
Browse files
Options

Merge pull request #804 from lavalamp/fixEtcd

Stop passing etcd_servers to controller manager
parents 63a7c376 ea47ca7a
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 8 deletions
cluster/saltbase/salt/controller-manager/default
View file @ 91b31c55
...@@ -6,10 +6,4 @@ ...@@ -6,10 +6,4 @@
{% if grains.master_ip is defined %} {% if grains.master_ip is defined %}
{% set master="-master=" + grains.master_ip + ":8080" %} {% set master="-master=" + grains.master_ip + ":8080" %}
{% endif %} {% endif %}
{% if grains.etcd_servers is defined %} DAEMON_ARGS="{{daemon_args}} {{master}}"
{% 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" %}
{% endif %}
DAEMON_ARGS="{{daemon_args}} {{master}} {{etcd_servers}}"
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment