node-installer: add required containerd plugin configuration

Signed-off-by: Paul Meyer <[email protected]>
edgelesssys · Aug 9, 2024 · 03a81b3 · 03a81b3
1 parent 58c3fa9
commit 03a81b3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/nodeinstaller/node-installer.go b/nodeinstaller/node-installer.go
@@ -204,6 +204,11 @@ func patchContainerdConfig(runtimeHandler, basePath, configPath string, platform
 	case platforms.K3sQEMUTDX, platforms.K3sQEMUSNP, platforms.RKE2QEMUTDX:
 		snapshotterName = fmt.Sprintf("nydus-%s", runtimeHandler)
 		socketName = fmt.Sprintf("/run/containerd/containerd-nydus-grpc-%s.sock", runtimeHandler)
+
+		// Configure the containerd plugin
+		containerdPlugin := ensureMapPath(&existing.Plugins, constants.CRIFQDN, "containerd")
+		containerdPlugin["discard_unpacked_layers"] = false
+		containerdPlugin["disable_snapshot_annotations"] = false
 	}
 
 	// Add the snapshotter proxy plugin.

diff --git a/nodeinstaller/testdata/expected-bare-metal-qemu-snp.toml b/nodeinstaller/testdata/expected-bare-metal-qemu-snp.toml
@@ -23,6 +23,7 @@ conf_template = '/etc/containerd/kubenet_template.conf'
 [plugins.'io.containerd.grpc.v1.cri'.containerd]
 default_runtime_name = 'runc'
 disable_snapshot_annotations = false
+discard_unpacked_layers = false
 
 [plugins.'io.containerd.grpc.v1.cri'.containerd.runtimes]
 [plugins.'io.containerd.grpc.v1.cri'.containerd.runtimes.kata]

diff --git a/nodeinstaller/testdata/expected-bare-metal-qemu-tdx.toml b/nodeinstaller/testdata/expected-bare-metal-qemu-tdx.toml
@@ -23,6 +23,7 @@ conf_template = '/etc/containerd/kubenet_template.conf'
 [plugins.'io.containerd.grpc.v1.cri'.containerd]
 default_runtime_name = 'runc'
 disable_snapshot_annotations = false
+discard_unpacked_layers = false
 
 [plugins.'io.containerd.grpc.v1.cri'.containerd.runtimes]
 [plugins.'io.containerd.grpc.v1.cri'.containerd.runtimes.kata]