From 567ee65c26d8422b93edd5eb91d0d224c9903c4d Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 25 Dec 2024 22:12:47 -0500 Subject: [PATCH] Enable CDI in containerd configuration Signed-off-by: Davanum Srinivas --- nodeadm/internal/api/merge_test.go | 2 ++ nodeadm/internal/containerd/config.template.toml | 1 + .../e2e/cases/containerd-config/expected-containerd-config.toml | 1 + .../expected-containerd-config.toml | 1 + .../expected-containerd-config.toml | 1 + templates/al2/runtime/containerd-config.toml | 1 + 6 files changed, 7 insertions(+) diff --git a/nodeadm/internal/api/merge_test.go b/nodeadm/internal/api/merge_test.go index dfce7d4d2..b1c7528f1 100644 --- a/nodeadm/internal/api/merge_test.go +++ b/nodeadm/internal/api/merge_test.go @@ -119,6 +119,7 @@ discard_unpacked_layers = true [plugins."io.containerd.grpc.v1.cri"] sandbox_image = "{{.SandboxImage}}" +enable_cdi = true [plugins."io.containerd.grpc.v1.cri".registry] config_path = "/etc/containerd/certs.d:/etc/docker/certs.d" @@ -195,6 +196,7 @@ discard_unpacked_layers = false [plugins."io.containerd.grpc.v1.cri"] sandbox_image = "{{.SandboxImage}}" +enable_cdi = true [plugins."io.containerd.grpc.v1.cri".registry] config_path = "/etc/containerd/certs.d:/etc/docker/certs.d" diff --git a/nodeadm/internal/containerd/config.template.toml b/nodeadm/internal/containerd/config.template.toml index 9252d7dc8..f8d6b02a4 100644 --- a/nodeadm/internal/containerd/config.template.toml +++ b/nodeadm/internal/containerd/config.template.toml @@ -11,6 +11,7 @@ discard_unpacked_layers = true [plugins."io.containerd.grpc.v1.cri"] sandbox_image = "{{.SandboxImage}}" +enable_cdi = true [plugins."io.containerd.grpc.v1.cri".registry] config_path = "/etc/containerd/certs.d:/etc/docker/certs.d" diff --git a/nodeadm/test/e2e/cases/containerd-config/expected-containerd-config.toml b/nodeadm/test/e2e/cases/containerd-config/expected-containerd-config.toml index 8796d64c3..8ccc4cea2 100644 --- a/nodeadm/test/e2e/cases/containerd-config/expected-containerd-config.toml +++ b/nodeadm/test/e2e/cases/containerd-config/expected-containerd-config.toml @@ -7,6 +7,7 @@ address = '/run/foo/foo.sock' [plugins] [plugins.'io.containerd.grpc.v1.cri'] +enable_cdi = true sandbox_image = 'localhost/kubernetes/pause' [plugins.'io.containerd.grpc.v1.cri'.cni] diff --git a/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/expected-containerd-config.toml b/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/expected-containerd-config.toml index 8796d64c3..8ccc4cea2 100644 --- a/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/expected-containerd-config.toml +++ b/nodeadm/test/e2e/cases/containerd-runtime-config-neuron/expected-containerd-config.toml @@ -7,6 +7,7 @@ address = '/run/foo/foo.sock' [plugins] [plugins.'io.containerd.grpc.v1.cri'] +enable_cdi = true sandbox_image = 'localhost/kubernetes/pause' [plugins.'io.containerd.grpc.v1.cri'.cni] diff --git a/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/expected-containerd-config.toml b/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/expected-containerd-config.toml index 6aef8a55d..0b358a83c 100644 --- a/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/expected-containerd-config.toml +++ b/nodeadm/test/e2e/cases/containerd-runtime-config-nvidia/expected-containerd-config.toml @@ -7,6 +7,7 @@ address = '/run/foo/foo.sock' [plugins] [plugins.'io.containerd.grpc.v1.cri'] +enable_cdi = true sandbox_image = 'localhost/kubernetes/pause' [plugins.'io.containerd.grpc.v1.cri'.cni] diff --git a/templates/al2/runtime/containerd-config.toml b/templates/al2/runtime/containerd-config.toml index c6791bc8e..cc35bac7e 100644 --- a/templates/al2/runtime/containerd-config.toml +++ b/templates/al2/runtime/containerd-config.toml @@ -12,6 +12,7 @@ discard_unpacked_layers = true [plugins."io.containerd.grpc.v1.cri"] sandbox_image = "SANDBOX_IMAGE" +enable_cdi = true [plugins."io.containerd.grpc.v1.cri".registry] config_path = "/etc/containerd/certs.d:/etc/docker/certs.d"