Skip to content
Snippets Groups Projects
Unverified Commit d325fd6a authored by Pat Riehecky's avatar Pat Riehecky Committed by GitHub
Browse files

Don't create calico CNI dir when not using calico (#10156)


Signed-off-by: default avatarPat Riehecky <riehecky@fnal.gov>
parent e949b8a1
No related branches found
No related tags found
No related merge requests found
...@@ -76,7 +76,6 @@ ...@@ -76,7 +76,6 @@
with_items: with_items:
- "/etc/cni/net.d" - "/etc/cni/net.d"
- "/opt/cni/bin" - "/opt/cni/bin"
- "/var/lib/calico"
when: when:
- kube_network_plugin in ["calico", "weave", "flannel", "cilium", "kube-ovn", "kube-router", "macvlan"] - kube_network_plugin in ["calico", "weave", "flannel", "cilium", "kube-ovn", "kube-router", "macvlan"]
- inventory_hostname in groups['k8s_cluster'] - inventory_hostname in groups['k8s_cluster']
...@@ -89,6 +88,22 @@ ...@@ -89,6 +88,22 @@
- kube-router - kube-router
- bootstrap-os - bootstrap-os
- name: Create calico cni directories
file:
path: "{{ item }}"
state: directory
owner: "{{ kube_owner }}"
mode: 0755
with_items:
- "/var/lib/calico"
when:
- kube_network_plugin == "calico"
- inventory_hostname in groups['k8s_cluster']
tags:
- network
- calico
- bootstrap-os
- name: Create local volume provisioner directories - name: Create local volume provisioner directories
file: file:
path: "{{ local_volume_provisioner_storage_classes[item].host_dir }}" path: "{{ local_volume_provisioner_storage_classes[item].host_dir }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment