github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-09 03:48:05 +00:00
Code Issues Projects Releases Wiki Activity

kata-deploy: k0s: Fix drop-in path

Browse Source 
The drop-in path should be /etc/containerd (from the containers'
perspective), which mounts to the host path /etc/k0s/containerd.d.

With what we had we ended up dropping the file under the
/etc/k0s/containerd.d/containerd.d/, which is wrong.

This is a regression introduce by: 94b3348d3c

Signed-off-by: Fabiano Fidêncio <fabiano@fidencio.org>
This commit is contained in:
Fabiano Fidêncio 2025-02-28 16:14:01 +01:00
parent d13be49f9b
commit c95f9885ea
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/_helpers.tpl
View File

@ -12,7 +12,7 @@ Set the correct containerd conf path depending on the k8s distribution
{{- else if eq .k8sDistribution "k3s" -}} {{- else if eq .k8sDistribution "k3s" -}}
/var/lib/rancher/k3s/agent/etc/containerd/ /var/lib/rancher/k3s/agent/etc/containerd/
{{- else if eq .k8sDistribution "k0s" -}} {{- else if eq .k8sDistribution "k0s" -}}
/etc/k0s/containerd.d/ /etc/k0s/
{{- else if eq .k8sDistribution "microk8s" -}} {{- else if eq .k8sDistribution "microk8s" -}}
/var/snap/microk8s/current/args/ /var/snap/microk8s/current/args/
{{- else -}} {{- else -}}

2
tools/packaging/kata-deploy/kata-cleanup/overlays/k0s/mount_k0s_conf.yaml
View File

@ -14,4 +14,4 @@ spec:
volumes: volumes:
- name: containerd-conf - name: containerd-conf
hostPath: hostPath:
path: /etc/k0s/containerd.d/ path: /etc/k0s/