External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-12 11:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Do not override kubelet hostname if cloud_provider is used (#2095)

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

Fixes #2094
This commit is contained in:
Matthew Mosesohn
2017-12-19 20:18:20 +00:00
committed by GitHub
parent a6975c1850
commit 127bc01857
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,7 +78,12 @@ kubelet_custom_flags: []
kube_hyperkube_image_repo: "" 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: "{{ ansible_hostname }}" kube_override_hostname: >-
{% if cloud_provider is defined %}
false
{% else %}
{{ ansible_hostname }}
{% endif %}
# cAdvisor port # cAdvisor port
kube_cadvisor_port: 0 kube_cadvisor_port: 0