Fix cilium to use k3s paths for binPath and confPath (#1381)

* Update cilium-values-init.partial.yaml.j2

* Update cilium-values-full.partial.yaml.j2

* Update cluster-nuke.yaml.j2

---------

Co-authored-by: Devin Buhl <onedr0p@users.noreply.github.com>
This commit is contained in:
Petr ŘehořandDevin Buhl authored and GitHub committed 2024-03-20 08:05:51 -04:00
1 parent 5fa7c0d4f6
commit c6833e0b24
3 files changed
+13 -3

No files matched your search

@@ -52,7 +52,7 @@
loop: ["filter", "nat", "mangle", "raw"]
- name: Networking | Delete CNI directory
ansible.builtin.file:
path: /etc/cni/net.d
path: /var/lib/rancher/k3s/agent/etc/cni/net.d
state: absent
- name: Check to see if k3s-killall.sh exits
@@ -9,7 +9,12 @@ cgroup:
hostRoot: /sys/fs/cgroup
cluster:
id: 1
name: #{ bootstrap_cluster_name|default('home-kubernetes', true) }#
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 %#
containerRuntime:
integration: containerd
#% if bootstrap_distribution in ["k3s"] %#
@@ -9,7 +9,12 @@ cgroup:
hostRoot: /sys/fs/cgroup
cluster:
id: 1
name: #{ bootstrap_cluster_name|default('home-kubernetes', true) }#
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 %#
containerRuntime:
integration: containerd
#% if bootstrap_distribution in ["k3s"] %#