From 14f811bc5070e4c4d364d36654a00a2e0e30b965 Mon Sep 17 00:00:00 2001 From: nikParasyr Date: Tue, 24 Jun 2025 10:10:27 +0200 Subject: [PATCH] sdk_container/containerd: Add registry config_path Update containerd config to include the crio registry plugin that defines the config_path. This allows users to add host specific configuration for containerd without having to overwrite the default containerd config. --- .../changelog/changes/2025-06-25-containerd-registry-config.md | 1 + .../containerd/usr/share/containerd/config-cgroupfs.toml | 3 +++ .../coreos/sysext/containerd/usr/share/containerd/config.toml | 3 +++ 3 files changed, 7 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/changelog/changes/2025-06-25-containerd-registry-config.md diff --git a/sdk_container/src/third_party/coreos-overlay/changelog/changes/2025-06-25-containerd-registry-config.md b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2025-06-25-containerd-registry-config.md new file mode 100644 index 00000000000..0f258b2cc76 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/changelog/changes/2025-06-25-containerd-registry-config.md @@ -0,0 +1 @@ +- set default containerd [registry config](https://github.com/containerd/containerd/blob/main/docs/hosts.md#cri) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml index 742fbf4355c..1d17bfd2782 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml +++ b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml @@ -32,3 +32,6 @@ no_shim = false runtime_type = "io.containerd.runc.v2" [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] SystemdCgroup = false + +[plugins."io.containerd.grpc.v1.cri".registry] +config_path = "/etc/containerd/certs.d" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml index babc77b0e06..4151269e157 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml +++ b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml @@ -36,3 +36,6 @@ enable_selinux = true runtime_type = "io.containerd.runc.v2" [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] SystemdCgroup = true + +[plugins."io.containerd.grpc.v1.cri".registry] +config_path = "/etc/containerd/certs.d"