From 47bf2c2b41b8f28ad867f9dac123ae766e0a7bf7 Mon Sep 17 00:00:00 2001 From: Udo Waechter Date: Wed, 21 Dec 2022 13:40:38 +0100 Subject: [PATCH] containerd config for bullseye --- k8s/files/containerd-config.toml | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/k8s/files/containerd-config.toml b/k8s/files/containerd-config.toml index 07409ba..7fcb35d 100644 --- a/k8s/files/containerd-config.toml +++ b/k8s/files/containerd-config.toml @@ -4,20 +4,27 @@ version = 2 level = "warn" [plugins] + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + systemdCgroup = true + systemd_cgroup = true [plugins."io.containerd.grpc.v1.cri"] + [plugins."io.containerd.grpc.v1.cri".containerd] + [plugins."io.containerd.grpc.v1.cri".containerd.default_runtime] + runtime_type = "io.containerd.runc.v2" [plugins."io.containerd.grpc.v1.cri".cni] bin_dir = "/opt/cni/bin" conf_dir = "/etc/cni/net.d" [plugins."io.containerd.internal.v1.opt"] path = "/var/lib/containerd/opt" [plugins."io.containerd.grpc.v1.cri".registry] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."cr.lan"] - endpoint = ["http://cr.lan"] - [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."cr.lan"] + endpoint = ["http://cr.lan"] + [plugins."io.containerd.grpc.v1.cri".registry.mirrors."docker.io"] endpoint = [ "http://dr-mirror.lan", "https://registry-1.docker.io"] - [plugins."io.containerd.grpc.v1.cri".registry.configs] - [plugins."io.containerd.grpc.v1.cri".registry.configs."cr.lan".tls] - insecure_skip_verify = true - [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls] - insecure_skip_verify = true + [plugins."io.containerd.grpc.v1.cri".registry.configs] + [plugins."io.containerd.grpc.v1.cri".registry.configs."cr.lan".tls] + insecure_skip_verify = true + [plugins."io.containerd.grpc.v1.cri".registry.configs."docker.io".tls] + insecure_skip_verify = true