From e30b03dad5c8e3127124048b96f0fb137fb9314b Mon Sep 17 00:00:00 2001
From: "Dustin C. Hatch" <dustin@hatch.name>
Date: Tue, 19 Nov 2024 11:55:29 -0600
Subject: [PATCH] tf/userdata: Remove all CNI conflist files

CRI-O now installs more `.conflist` files in `/etc/cni/net.d`.  Their
presence interferes with Calico, so they need to be deleted in order to
have fully working Pod networking, especially for pods that start very
early (before Calico is completely ready).
---
 terraform/userdata.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terraform/userdata.yml b/terraform/userdata.yml
index 05a2370..c2a7237 100644
--- a/terraform/userdata.yml
+++ b/terraform/userdata.yml
@@ -92,7 +92,7 @@ write_files:
     EOF
     semodule -i longhorn-issue4988.cil
 
-    rm -f /etc/cni/net.d/100-crio-bridge.conflist
+    rm -f /etc/cni/net.d/*.conflist
 
     cat > /run/joinconfiguration <<EOF
     apiVersion: kubeadm.k8s.io/v1beta3