From c95f9885ea6c415fe060f0e12f48fd34ec087090 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 28 Feb 2025 16:14:01 +0100 Subject: [PATCH] kata-deploy: k0s: Fix drop-in path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- .../kata-deploy/helm-chart/kata-deploy/templates/_helpers.tpl | 2 +- .../kata-deploy/kata-cleanup/overlays/k0s/mount_k0s_conf.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/_helpers.tpl b/tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/_helpers.tpl index d17332778c..1441016cca 100644 --- a/tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/_helpers.tpl +++ b/tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/_helpers.tpl @@ -12,7 +12,7 @@ Set the correct containerd conf path depending on the k8s distribution {{- else if eq .k8sDistribution "k3s" -}} /var/lib/rancher/k3s/agent/etc/containerd/ {{- else if eq .k8sDistribution "k0s" -}} -/etc/k0s/containerd.d/ +/etc/k0s/ {{- else if eq .k8sDistribution "microk8s" -}} /var/snap/microk8s/current/args/ {{- else -}} diff --git a/tools/packaging/kata-deploy/kata-cleanup/overlays/k0s/mount_k0s_conf.yaml b/tools/packaging/kata-deploy/kata-cleanup/overlays/k0s/mount_k0s_conf.yaml index 899893baef..427f058af0 100644 --- a/tools/packaging/kata-deploy/kata-cleanup/overlays/k0s/mount_k0s_conf.yaml +++ b/tools/packaging/kata-deploy/kata-cleanup/overlays/k0s/mount_k0s_conf.yaml @@ -14,4 +14,4 @@ spec: volumes: - name: containerd-conf hostPath: - path: /etc/k0s/containerd.d/ + path: /etc/k0s/