Skip to content

Commit

Permalink
Fixes for calico etcd mode (2.19 backport) (#9234)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
chadswen authored Aug 30, 2022
1 parent 6eb3135 commit 4a66000
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions roles/network_plugin/calico/tasks/install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,7 @@
- {name: calico, file: calico-ipamconfig.yml, type: ipam}
when:
- inventory_hostname in groups['kube_control_plane']
- calico_datastore == "kdd"

- name: Calico | Create ipamconfig resources
kube:
Expand All @@ -590,3 +591,4 @@
state: "latest"
when:
- inventory_hostname == groups['kube_control_plane'][0]
- calico_datastore == "kdd"

0 comments on commit 4a66000

Please sign in to comment.