From 3212c7ae00a6271ac2400a0d9d860b808eaffd7b Mon Sep 17 00:00:00 2001 From: Orestis Lagkas Nikolos Date: Thu, 6 May 2021 03:01:36 -0500 Subject: [PATCH] packaging/kata-cleanup: add k3s containerd volume kata-deploy cleanup expects to find containerd configuration in /etc/containerd/config.toml. In case of k3s mount the k3s containerd config as a volume. Original PR #1802 Fixes #1801 Signed-off-by: Orestis Lagkas Nikolos --- .../overlays/k3s/kustomization.yaml | 5 +++++ .../overlays/k3s/mount_k3s_conf.yaml | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml create mode 100644 tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/mount_k3s_conf.yaml diff --git a/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml b/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml new file mode 100644 index 0000000000..2e37b842b7 --- /dev/null +++ b/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/kustomization.yaml @@ -0,0 +1,5 @@ +bases: +- ../../base + +patchesStrategicMerge: +- mount_k3s_conf.yaml diff --git a/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/mount_k3s_conf.yaml b/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/mount_k3s_conf.yaml new file mode 100644 index 0000000000..8173a47565 --- /dev/null +++ b/tools/packaging/kata-deploy/kata-cleanup/overlays/k3s/mount_k3s_conf.yaml @@ -0,0 +1,17 @@ +apiVersion: apps/v1 +kind: DaemonSet +metadata: + name: kubelet-kata-cleanup + namespace: kube-system +spec: + template: + spec: + containers: + - name: kube-kata-cleanup + volumeMounts: + - name: containerd-conf + mountPath: /etc/containerd/ + volumes: + - name: containerd-conf + hostPath: + path: /var/lib/rancher/k3s/agent/etc/containerd/