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

Revert back to using an empty var as default to exclude hostname (#2110)

pull/2112/head
Jan Jungnickel 2017-12-22 23:09:59 +01:00 committed by Matthew Mosesohn
parent 29f5b55d42
commit 3fdb2ccf55
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -80,7 +80,6 @@ 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
{%- else -%} {%- else -%}
{{ ansible_hostname }} {{ ansible_hostname }}
{%- endif -%} {%- endif -%}

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|bool %} {% if kube_override_hostname|default('') %}
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|bool %} {% if kube_override_hostname|default('') %}
KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}"
{% endif %} {% endif %}
{# Base kubelet args #} {# Base kubelet args #}