Skip to content
Snippets Groups Projects
Commit 3fdb2ccf authored by Jan Jungnickel's avatar Jan Jungnickel Committed by Matthew Mosesohn
Browse files

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

parent 29f5b55d
Branches
Tags
No related merge requests found
...@@ -80,7 +80,6 @@ kube_hyperkube_image_repo: "" ...@@ -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 -%}
......
...@@ -9,7 +9,7 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre ...@@ -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 #}
......
...@@ -6,7 +6,7 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre ...@@ -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 #}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment