Skip to content

Commit

Permalink
Do not override kubelet hostname if cloud_provider is used (kubernete…
Browse files Browse the repository at this point in the history
…s-sigs#2095)

Starting with Kubernetes v1.8.4, kubelet ignores the AWS cloud
provider string and uses the override hostname, which fails
Node admission checks.

Fixes kubernetes-sigs#2094
  • Loading branch information
mattymo authored Dec 19, 2017
1 parent a6975c1 commit 127bc01
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion roles/kubernetes/node/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,12 @@ kubelet_custom_flags: []
kube_hyperkube_image_repo: ""

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

0 comments on commit 127bc01

Please sign in to comment.