From 33a9e99c77efba90af5f7fcc88beec91d4b0a49b Mon Sep 17 00:00:00 2001 From: Chad Swenson Date: Tue, 30 Aug 2022 10:01:23 -0500 Subject: [PATCH] Fixes for calico etcd mode (2.19 backport) 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. --- roles/network_plugin/calico/tasks/install.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml index a8b1267eb51..d9a3c9b990f 100644 --- a/roles/network_plugin/calico/tasks/install.yml +++ b/roles/network_plugin/calico/tasks/install.yml @@ -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: @@ -590,3 +591,4 @@ state: "latest" when: - inventory_hostname == groups['kube_control_plane'][0] + - calico_datastore == "kdd" \ No newline at end of file