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

Merge pull request #2713 from komljen/master

Browse Source 
Remove empty lines when file is generated from jinja template
This commit is contained in:
Eric Tune 2014-12-02 10:03:21 -08:00
commit 43e66f4fe2
5 changed files with 110 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,49 +1,49 @@
{% set daemon_args = "$DAEMON_ARGS" %} {% set daemon_args = "$DAEMON_ARGS" -%}
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" %} {% set daemon_args = "" -%}
{% endif %} {% endif -%}
{% set cloud_provider = "" %} {% set cloud_provider = "" -%}
{% if grains.cloud_provider is defined %} {% if grains.cloud_provider is defined -%}
{% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %} {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider -%}
{% endif %} {% endif -%}
{% set address = "-address=127.0.0.1" %} {% set address = "-address=127.0.0.1" -%}
{% set publicAddressOverride = "" %} {% set publicAddressOverride = "" -%}
{% if grains.publicAddressOverride is defined %} {% if grains.publicAddressOverride is defined -%}
{% set publicAddressOverride = "-public_address_override=" + grains.publicAddressOverride %} {% set publicAddressOverride = "-public_address_override=" + grains.publicAddressOverride -%}
{% endif %} {% endif -%}
{% if grains.etcd_servers is defined %} {% if grains.etcd_servers is defined -%}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %} {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
{% 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 etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
{% endif %} {% endif -%}
{% if grains.cloud is defined %} {% if grains.cloud is defined -%}
{% if grains.cloud == 'gce' %} {% if grains.cloud == 'gce' -%}
{% set cloud_provider = "-cloud_provider=gce" %} {% set cloud_provider = "-cloud_provider=gce" -%}
{% endif %} {% endif -%}
{% endif %} {% endif -%}
{% if pillar['portal_net'] is defined %} {% if pillar['portal_net'] is defined -%}
{% set portal_net = "-portal_net=" + pillar['portal_net'] %} {% set portal_net = "-portal_net=" + pillar['portal_net'] -%}
{% endif %} {% endif -%}
{% set cert_file = "-tls_cert_file=/srv/kubernetes/server.cert" %} {% set cert_file = "-tls_cert_file=/srv/kubernetes/server.cert" -%}
{% set key_file = "-tls_private_key_file=/srv/kubernetes/server.key" %} {% set key_file = "-tls_private_key_file=/srv/kubernetes/server.key" -%}
{% set secure_port = "-secure_port=6443" %} {% set secure_port = "-secure_port=6443" -%}
{% set token_auth_file = "-token_auth_file=/dev/null" %} {% set token_auth_file = "-token_auth_file=/dev/null" -%}
{% if grains.cloud is defined %} {% if grains.cloud is defined -%}
{% if grains.cloud == 'gce' %} {% if grains.cloud == 'gce' -%}
# TODO: generate and distribute tokens for other cloud providers. # TODO: generate and distribute tokens for other cloud providers.
{% set token_auth_file = "-token_auth_file=/srv/kubernetes/known_tokens.csv" %} {% set token_auth_file = "-token_auth_file=/srv/kubernetes/known_tokens.csv" -%}
{% endif %} {% endif -%}
{% endif %} {% endif -%}
DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}}" DAEMON_ARGS="{{daemon_args}} {{address}} {{etcd_servers}} {{ cloud_provider }} --allow_privileged={{pillar['allow_privileged']}} {{portal_net}} {{cert_file}} {{key_file}} {{secure_port}} {{token_auth_file}} {{publicAddressOverride}}"

68
cluster/saltbase/salt/kube-controller-manager/default
View File

@ -1,49 +1,49 @@
{% set daemon_args = "$DAEMON_ARGS" %} {% set daemon_args = "$DAEMON_ARGS" -%}
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" %} {% set daemon_args = "" -%}
{% endif %} {% endif -%}
{% set master="-master=127.0.0.1:8080" %} {% set master="-master=127.0.0.1:8080" -%}
{% set machines = ""%} {% set machines = ""-%}
{% set cloud_provider = "" %} {% set cloud_provider = "" -%}
{% set minion_regexp = "-minion_regexp=.*" %} {% set minion_regexp = "-minion_regexp=.*" -%}
{% if grains.cloud_provider is defined %} {% if grains.cloud_provider is defined -%}
{% set cloud_provider = "-cloud_provider=" + grains.cloud_provider %} {% set cloud_provider = "-cloud_provider=" + grains.cloud_provider -%}
{% endif %} {% endif -%}
{% if pillar['node_instance_prefix'] is defined %} {% if pillar['node_instance_prefix'] is defined -%}
{% set minion_regexp = "-minion_regexp='" + pillar['node_instance_prefix'] + ".*'" %} {% set minion_regexp = "-minion_regexp='" + pillar['node_instance_prefix'] + ".*'" -%}
{% endif %} {% endif -%}
{% if grains.cloud is defined %} {% if grains.cloud is defined -%}
{% if 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()) -%}
{% endif %} {% endif -%}
{% if grains.cloud == 'aws' %} {% if grains.cloud == 'aws' -%}
# TODO: turn on AWS as a cloud provider. Need to figure out AWS role-based auth. # TODO: turn on AWS as a cloud provider. Need to figure out AWS role-based auth.
{% set cloud_provider = "" %} {% set cloud_provider = "" -%}
{% set minion_regexp = "" %} {% set minion_regexp = "" -%}
{% 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()) -%}
{% endif %} {% endif -%}
{% if grains.cloud == 'azure' %} {% if grains.cloud == 'azure' -%}
MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}" MACHINES="{{ salt['mine.get']('roles:kubernetes-pool', 'grains.items', expr_form='grain').values()|join(',', attribute='hostnamef') }}"
{% set machines = "-machines=$MACHINES" %} {% set machines = "-machines=$MACHINES" -%}
{% endif %} {% endif -%}
{% if grains.cloud == 'vsphere' %} {% if grains.cloud == 'vsphere' -%}
# Collect IPs of minions as machines list. # Collect IPs of minions as machines list.
# #
# Use a bash array to build the value we need. Jinja 2.7 does support a 'map' # Use a bash array to build the value we need. Jinja 2.7 does support a 'map'
# filter that would simplify this. However, some installations (specifically # filter that would simplify this. However, some installations (specifically
# Debian Wheezy) only install Jinja 2.6. # Debian Wheezy) only install Jinja 2.6.
MACHINE_IPS=() MACHINE_IPS=()
{% for addrs in salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').values() %} {% for addrs in salt['mine.get']('roles:kubernetes-pool', 'network.ip_addrs', expr_form='grain').values() -%}
MACHINE_IPS+=( {{ addrs[0] }} ) MACHINE_IPS+=( {{ addrs[0] }} )
{% endfor %} {% endfor -%}
{% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" %} {% set machines = "-machines=$(echo ${MACHINE_IPS[@]} | xargs -n1 echo | paste -sd,)" -%}
{% set minion_regexp = "" %} {% set minion_regexp = "" -%}
{% endif %} {% endif -%}
{% endif %} {% endif -%}
DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }}" DAEMON_ARGS="{{daemon_args}} {{master}} {{machines}} {{ minion_regexp }} {{ cloud_provider }}"

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

@ -1,11 +1,12 @@
{% set daemon_args = "$DAEMON_ARGS" %} {% set daemon_args = "$DAEMON_ARGS" -%}
{% 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.etcd_servers is defined -%}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %} {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
{% 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 etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
{% endif %} {% endif -%}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}}" DAEMON_ARGS="{{daemon_args}} {{etcd_servers}}"

11
cluster/saltbase/salt/kube-scheduler/default
View File

@ -1,6 +1,7 @@
{% set daemon_args = "$DAEMON_ARGS" %} {% set daemon_args = "$DAEMON_ARGS" -%}
{% if grains['os_family'] == 'RedHat' %} {% if grains['os_family'] == 'RedHat' -%}
{% set daemon_args = "" %} {% set daemon_args = "" -%}
{% endif %} {% endif -%}
{% set master="-master=127.0.0.1:8080" %} {% set master="-master=127.0.0.1:8080" -%}
DAEMON_ARGS="{{daemon_args}} {{master}}" DAEMON_ARGS="{{daemon_args}} {{master}}"

46
cluster/saltbase/salt/kubelet/default
View File

@ -1,28 +1,28 @@
{% set daemon_args = "$DAEMON_ARGS" %} {% set daemon_args = "$DAEMON_ARGS" -%}
{% 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.etcd_servers is defined -%}
{% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" %} {% set etcd_servers = "-etcd_servers=http://" + grains.etcd_servers + ":4001" -%}
{% 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 etcd_servers = "-etcd_servers=http://" + ips[0][0] + ":4001" -%}
{% endif %} {% endif -%}
{% if grains.apiservers is defined %} {% if grains.apiservers is defined -%}
{% set apiservers = "-api_servers=https://" + grains.apiservers + ":6443" %} {% set apiservers = "-api_servers=https://" + grains.apiservers + ":6443" -%}
{% 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 apiservers = "-api_servers=https://" + ips[0][0] + ":6443" %} {% set apiservers = "-api_servers=https://" + ips[0][0] + ":6443" -%}
{% endif %} {% endif -%}
{% set address = "-address=0.0.0.0" %} {% set address = "-address=0.0.0.0" -%}
{% set config = "-config=/etc/kubernetes/manifests" %} {% set config = "-config=/etc/kubernetes/manifests" -%}
{% set hostname_override = "" %} {% set hostname_override = "" -%}
{% if grains.minion_ip is defined %} {% if grains.minion_ip is defined -%}
{% set hostname_override = " -hostname_override=" + grains.minion_ip %} {% set hostname_override = " -hostname_override=" + grains.minion_ip -%}
{% endif %} {% endif -%}
{% set auth_path = "-auth_path=/var/lib/kubelet/kubernetes_auth" %} {% set auth_path = "-auth_path=/var/lib/kubelet/kubernetes_auth" -%}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}}" DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{apiservers}} {{auth_path}} {{hostname_override}} {{address}} {{config}} --allow_privileged={{pillar['allow_privileged']}}"