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

Fixes for calico_datastore: etcd (#9228)

Browse source 
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 00:41:00 -05:00 committed by GitHub
parent e60ece2b5e
commit de762400ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 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

@ -451,6 +451,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:
@ -459,6 +460,7 @@
state: "latest" state: "latest"
when: when:
- inventory_hostname == groups['kube_control_plane'][0] - inventory_hostname == groups['kube_control_plane'][0]
- calico_datastore == "kdd"
- include_tasks: peer_with_calico_rr.yml - include_tasks: peer_with_calico_rr.yml
when: when:

2
roles/network_plugin/calico/templates/calico-cr.yml.j2
View file

@ -157,6 +157,7 @@ rules:
- daemonsets - daemonsets
verbs: verbs:
- get - get
{% endif %}
# Used for creating service account tokens to be used by the CNI plugin # Used for creating service account tokens to be used by the CNI plugin
- apiGroups: [""] - apiGroups: [""]
resources: resources:
@ -165,4 +166,3 @@ rules:
- calico-node - calico-node
verbs: verbs:
- create - create
{% endif %}