From 3fdb2ccf55d90646f8a595ed0c29339dadfdf962 Mon Sep 17 00:00:00 2001 From: Jan Jungnickel Date: Fri, 22 Dec 2017 23:09:59 +0100 Subject: [PATCH] Revert back to using an empty var as default to exclude hostname (#2110) --- roles/kubernetes/node/defaults/main.yml | 1 - roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 | 2 +- roles/kubernetes/node/templates/kubelet.standard.env.j2 | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml index 91a6f6f50..24775a541 100644 --- a/roles/kubernetes/node/defaults/main.yml +++ b/roles/kubernetes/node/defaults/main.yml @@ -80,7 +80,6 @@ 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 -%} - false {%- else -%} {{ ansible_hostname }} {%- endif -%} diff --git a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 index e48e08bd9..564160b61 100644 --- a/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.kubeadm.env.j2 @@ -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|bool %} +{% if kube_override_hostname|default('') %} KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" {% endif %} {# Base kubelet args #} diff --git a/roles/kubernetes/node/templates/kubelet.standard.env.j2 b/roles/kubernetes/node/templates/kubelet.standard.env.j2 index b360757b5..e50446a86 100644 --- a/roles/kubernetes/node/templates/kubelet.standard.env.j2 +++ b/roles/kubernetes/node/templates/kubelet.standard.env.j2 @@ -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|bool %} +{% if kube_override_hostname|default('') %} KUBELET_HOSTNAME="--hostname-override={{ kube_override_hostname }}" {% endif %} {# Base kubelet args #}