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

This commit is contained in:
Devin Buhl authored and GitHub committed 2024-03-26 11:30:54 -04:00
1 parent 94cffb45e3
commit d3a4b10641
3 files changed
+3 -13

No files matched your search

@@ -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
@@ -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"] %#
@@ -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"] %#