C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix calico when kube_override_hostname is set (#4235)

Browse source 
This fixes an issue where the `nodename` in calico's cni config json can fall out of sync with the k8s node name used by the calico pod if `kube_override_hostname` is set
This commit is contained in:
Chad Swenson 2019-02-13 18:02:48 -06:00 committed by Kubernetes Prow Robot
parent 061f5a313b
commit 8872b2e0c6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/network_plugin/calico/defaults/main.yml
View file

@ -61,7 +61,7 @@ calico_healthhost: "localhost"
# see https://docs.projectcalico.org/v3.0/reference/node/configuration#ip-autodetection-methods # see https://docs.projectcalico.org/v3.0/reference/node/configuration#ip-autodetection-methods
# calico_ip_auto_method: "interface=eth.*" # calico_ip_auto_method: "interface=eth.*"
calico_baremetal_nodename: "{{ inventory_hostname }}" calico_baremetal_nodename: "{{ kube_override_hostname | default(inventory_hostname) }}"
### do not enable this, this is detected in scope of tasks, this is just a default value ### do not enable this, this is detected in scope of tasks, this is just a default value
calico_upgrade_needed: false calico_upgrade_needed: false

4
roles/network_plugin/calico/tasks/main.yml
View file

@ -1,7 +1,7 @@
--- ---
- include_tasks: check.yml - import_tasks: check.yml
- include_tasks: pre.yml - import_tasks: pre.yml
- import_tasks: upgrade.yml - import_tasks: upgrade.yml
when: when: