Revert "Fix cilium to use k3s paths for binPath and confPath" (#1388)

onedr0p · Mar 26, 2024 · d3a4b10 · d3a4b10
1 parent 94cffb4
commit d3a4b10
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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"] %#