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

Fixes for calico etcd mode (2.19 backport) (#9234)

Browse source 
release-2.19 backport of #9228

It seems that PR #8839 broke `calico_datastore: etcd` when it removed ipamconfig support for etcd mode.

This PR fixes some failing tasks when calico_datastore == etcd, but it does not restore ipamconfig support for calico in etcd mode. If someone wants to restore ipamconfig support for calico_datastore: etcd please submit a follow up PR for that.
This commit is contained in:
Chad Swenson 2022-08-30 12:02:55 -05:00 committed by GitHub
parent 6eb313584e
commit 4a6600002f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/network_plugin/calico/tasks/install.yml
View file

@ -582,6 +582,7 @@
- {name: calico, file: calico-ipamconfig.yml, type: ipam} - {name: calico, file: calico-ipamconfig.yml, type: ipam}
when: when:
- inventory_hostname in groups['kube_control_plane'] - inventory_hostname in groups['kube_control_plane']
- calico_datastore == "kdd"
- name: Calico | Create ipamconfig resources - name: Calico | Create ipamconfig resources
kube: kube:
@ -590,3 +591,4 @@
state: "latest" state: "latest"
when: when:
- inventory_hostname == groups['kube_control_plane'][0] - inventory_hostname == groups['kube_control_plane'][0]
- calico_datastore == "kdd"