Skip to content

fix: containerd config compatible with both 1.x and 2.x CRI plugins #5999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kriscoleman wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: containerd config compatible with both 1.x and 2.x CRI plugins #5999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions addons/containerd/1.6.28/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/1.6.31/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/1.6.32/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/1.6.33/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/1.7.25/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/1.7.26/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/1.7.27/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/1.7.28/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/1.7.29/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
14 changes: 9 additions & 5 deletions addons/containerd/template/base/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,17 @@ function containerd_configure() {
mkdir -p /etc/containerd
containerd config default > /etc/containerd/config.toml

# Remove old-style systemd_cgroup key (containerd < 1.4)
sed -i '/systemd_cgroup/d' /etc/containerd/config.toml
sed -i '/containerd.runtimes.runc.options/d' /etc/containerd/config.toml
# Enable SystemdCgroup for runc — works for both containerd 1.x and 2.x plugin names
# since the key lives under [plugins."<cri-plugin>".containerd.runtimes.runc.options]
# in both config versions.
sed -i 's/SystemdCgroup = false/SystemdCgroup = true/' /etc/containerd/config.toml
sed -i 's/level = ""/level = "warn"/' /etc/containerd/config.toml

# Ensure the hosts.toml config directory exists before containerd restarts
mkdir -p /etc/containerd/certs.d

# Ensure containerd reads per-registry hosts.toml files (required for 1.x; no-op on 2.x which already sets this)
sed -i 's|config_path = ""|config_path = "/etc/containerd/certs.d"|' /etc/containerd/config.toml

Expand All @@ -180,10 +188,6 @@ function containerd_configure() {
# ignores colon-separated config_path values and never reads hosts.toml as a result.
# https://github.com/containerd/containerd/issues/12415
sed -i "s|config_path = '/etc/containerd/certs\.d:/etc/docker/certs\.d'|config_path = '/etc/containerd/certs.d'|" /etc/containerd/config.toml
cat >> /etc/containerd/config.toml <<EOF
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
SystemdCgroup = true
EOF
local pause_image=
pause_image="$(containerd_kubernetes_pause_image)"
if [ -n "$pause_image" ]; then
Expand Down
Loading