Enable CDI in containerd configuration

Signed-off-by: Davanum Srinivas <[email protected]>
awslabs · Dec 26, 2024 · 567ee65 · 567ee65
1 parent 3b667df
commit 567ee65
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"