From d17d311efa11a19b6a515b5432f4dcfa797bb1d9 Mon Sep 17 00:00:00 2001
From: Pat Riehecky <riehecky@fnal.gov>
Date: Tue, 30 May 2023 13:11:06 -0500
Subject: [PATCH] Don't create calico CNI dir when not using calico

Signed-off-by: Pat Riehecky <riehecky@fnal.gov>
---
 .../tasks/0050-create_directories.yml           | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/roles/kubernetes/preinstall/tasks/0050-create_directories.yml b/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
index 996eb4f32c1..f77398986b6 100644
--- a/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
+++ b/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
@@ -76,7 +76,6 @@
   with_items:
     - "/etc/cni/net.d"
     - "/opt/cni/bin"
-    - "/var/lib/calico"
   when:
     - kube_network_plugin in ["calico", "weave", "flannel", "cilium", "kube-ovn", "kube-router", "macvlan"]
     - inventory_hostname in groups['k8s_cluster']
@@ -89,6 +88,22 @@
     - kube-router
     - 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
   file:
     path: "{{ local_volume_provisioner_storage_classes[item].host_dir }}"