Browse Source
remove unwanted whitespace for kube_override_hostname (#2105)
pull/2109/head
Matthew Mosesohn
7 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
5 additions and
5 deletions
-
roles/kubernetes/node/defaults/main.yml
-
roles/kubernetes/node/templates/kubelet.kubeadm.env.j2
-
roles/kubernetes/node/templates/kubelet.standard.env.j2
|
|
|
@ -79,11 +79,11 @@ kube_hyperkube_image_repo: "" |
|
|
|
|
|
|
|
# If non-empty, will use this string as identification instead of the actual hostname |
|
|
|
kube_override_hostname: >- |
|
|
|
{% if cloud_provider is defined %} |
|
|
|
{%- if cloud_provider is defined -%} |
|
|
|
false |
|
|
|
{% else %} |
|
|
|
{%- else -%} |
|
|
|
{{ ansible_hostname }} |
|
|
|
{% endif %} |
|
|
|
{%- endif -%} |
|
|
|
|
|
|
|
# cAdvisor port |
|
|
|
kube_cadvisor_port: 0 |
|
|
|
@ -9,7 +9,7 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre |
|
|
|
# The port for the info server to serve on |
|
|
|
# KUBELET_PORT="--port=10250" |
|
|
|
# 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 }}" |
|
|
|
{% endif %} |
|
|
|
{# Base kubelet args #} |
|
|
|
|
|
|
|
@ -6,7 +6,7 @@ KUBELET_ADDRESS="--address={{ kubelet_bind_address }} --node-ip={{ kubelet_addre |
|
|
|
# The port for the info server to serve on |
|
|
|
# KUBELET_PORT="--port=10250" |
|
|
|
# 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 }}" |
|
|
|
{% endif %} |
|
|
|
{# Base kubelet args #} |
|
|
|
|
