kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove unwanted whitespace for kube_override_hostname (#2105)

pull/2109/head
Matthew Mosesohn 2017-12-22 11:31:18 +00:00 committed by GitHub
parent 336e0cbf70
commit 29f5b55d42
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/kubernetes/node/defaults/main.yml
View File

@ -79,11 +79,11 @@ kube_hyperkube_image_repo: ""
# If non-empty, will use this string as identification instead of the actual hostname # If non-empty, will use this string as identification instead of the actual hostname
kube_override_hostname: >- kube_override_hostname: >-
{% if cloud_provider is defined %} {%- if cloud_provider is defined -%}
false false
{% else %} {%- else -%}
{{ ansible_hostname }} {{ ansible_hostname }}
{% endif %} {%- endif -%}
# cAdvisor port # cAdvisor port
kube_cadvisor_port: 0 kube_cadvisor_port: 0

2
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
View File

@ -9,7 +9,7 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre
# The port for the info server to serve on # The port for the info server to serve on
# KUBELET_PORT="--port=10250" # KUBELET_PORT="--port=10250"
# You may leave this blank to use the actual hostname # You may leave this blank to use the actual hostname
{% if kube_override_hostname %} {% if kube_override_hostname|bool %}
KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% endif %} {% endif %}
{# Base kubelet args #} {# Base kubelet args #}

2
roles/kubernetes/node/templates/kubelet.standard.env.j2
View File

@ -6,7 +6,7 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre
# The port for the info server to serve on # The port for the info server to serve on
# KUBELET_PORT="--port=10250" # KUBELET_PORT="--port=10250"
# You may leave this blank to use the actual hostname # You may leave this blank to use the actual hostname
{% if kube_override_hostname %} {% if kube_override_hostname|bool %}
KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% endif %} {% endif %}
{# Base kubelet args #} {# Base kubelet args #}