github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1029 from pietern/apiserver-defaults 

Update apiserver defaults template
pull/6/head
Joe Beda 2014-08-25 16:49:08 -07:00
parent 823c66b902 65bb90ffef
commit c99811a2c6
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cluster/saltbase/salt/apiserver/default
View File

@ -18,16 +18,18 @@
{% 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 etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" %}
{% endif %} {% endif %}
{% if grains.minion_ips is defined %}
{% set machines = "-machines " + grains.minion_ips %} {% if grains.cloud is defined %}
{% elif grains.cloud is defined and grains.cloud == 'gce' %} {% if grains.cloud == 'gce' %}
{% set cloud_provider = "-cloud_provider=gce" %} {% set cloud_provider = "-cloud_provider=gce" %}
{% set machines = "-machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) %} {% set machines = "-machines " + ','.join(salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').keys()) %}
{% elif grains.cloud is defined and grains.cloud == 'azure' %} {% endif %}
MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}" {% if grains.cloud == 'azure' %}
MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}"
{% set machines = "-machines $MACHINES" %} {% set machines = "-machines $MACHINES" %}
{% else %} {% endif %}
# No cloud defined, collect IPs of minions as machines list. {% if grains.cloud == 'vsphere' %}
# Collect IPs of minions as machines list.
# Use a bash array to build the value we need. It doesn't appear to be # Use a bash array to build the value we need. It doesn't appear to be
# possible call functions map or zip, or use lambda's from Jinja. # possible call functions map or zip, or use lambda's from Jinja.
MACHINE_IPS=() MACHINE_IPS=()
@ -36,5 +38,6 @@
{% endfor %} {% endfor %}
{% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" %} {% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" %}
{% endif %} {% endif %}
{% endif %}
DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }}" DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }}"

1
cluster/vsphere/templates/salt-master.sh
View File

@ -25,6 +25,7 @@ cat <<EOF >/etc/salt/minion.d/grains.conf
grains: grains:
roles: roles:
- kubernetes-master - kubernetes-master
cloud: vsphere
EOF EOF
# Auto accept all keys from minions that try to join # Auto accept all keys from minions that try to join