From d3a4b1064130e73d17a1cedd4c93d123f870d913 Mon Sep 17 00:00:00 2001
From: Devin Buhl <onedr0p@users.noreply.github.com>
Date: Tue, 26 Mar 2024 11:30:54 -0400
Subject: [PATCH] Revert "Fix cilium to use k3s paths for binPath and confPath"
 (#1388)

---
 bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2 | 2 +-
 .../templates/partials/cilium-values-full.partial.yaml.j2  | 7 +------
 .../templates/partials/cilium-values-init.partial.yaml.j2  | 7 +------
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2 b/bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2
index 400c1e79..a99265b8 100644
--- a/bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2
+++ b/bootstrap/templates/ansible/playbooks/cluster-nuke.yaml.j2
@@ -52,7 +52,7 @@
           loop: ["filter", "nat", "mangle", "raw"]
         - name: Networking | Delete CNI directory
           ansible.builtin.file:
-            path: /var/lib/rancher/k3s/agent/etc/cni/net.d
+            path: /etc/cni/net.d
             state: absent
 
     - name: Check to see if k3s-killall.sh exits
diff --git a/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2 b/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2
index 2134c40e..37c4f7c4 100644
--- a/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2
+++ b/bootstrap/templates/partials/cilium-values-full.partial.yaml.j2
@@ -9,12 +9,7 @@ cgroup:
   hostRoot: /sys/fs/cgroup
 cluster:
   id: 1
-  name: "#{ bootstrap_cluster_name|default('home-kubernetes', true) }#"
-#% if bootstrap_distribution in ["k3s"] %#
-cni:
-  binPath: /var/lib/rancher/k3s/data/current/bin
-  confPath: /var/lib/rancher/k3s/agent/etc/cni/net.d
-#% endif %#
+  name: #{ bootstrap_cluster_name|default('home-kubernetes', true) }#
 containerRuntime:
   integration: containerd
   #% if bootstrap_distribution in ["k3s"] %#
diff --git a/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2 b/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2
index 7e89bbcc..d7c9875c 100644
--- a/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2
+++ b/bootstrap/templates/partials/cilium-values-init.partial.yaml.j2
@@ -9,12 +9,7 @@ cgroup:
   hostRoot: /sys/fs/cgroup
 cluster:
   id: 1
-  name: "#{ bootstrap_cluster_name|default('home-kubernetes', true) }#"
-#% if bootstrap_distribution in ["k3s"] %#
-cni:
-  binPath: /var/lib/rancher/k3s/data/current/bin
-  confPath: /var/lib/rancher/k3s/agent/etc/cni/net.d
-#% endif %#
+  name: #{ bootstrap_cluster_name|default('home-kubernetes', true) }#
 containerRuntime:
   integration: containerd
   #% if bootstrap_distribution in ["k3s"] %#