[no-relnote] add e2e for containerd

Signed-off-by: Carlos Eduardo Arango Gutierrez <[email protected]>

Author: ArangoGutierrez

cmd/nvidia-ctk-installer/toolkit/installer/executables.go

@@ -20,10 +20,10 @@ package installer
 import (
 	"bytes"
 	"fmt"
-	"html/template"
 	"io"
 	"path/filepath"
 	"strings"
+	"text/template"
 
 	log "github.com/sirupsen/logrus"
 

pkg/config/engine/containerd/config_drop_in.go

@@ -153,10 +153,7 @@ func (c *topLevelConfig) removeVersion() {
 
 func (c *topLevelConfig) ensureImports(dropInFilename string) {
 	config := c.config.Tree
-	var currentImports []string
-	if ci, ok := c.config.Get("imports").([]string); ok {
-		currentImports = ci
-	}
+	currentImports, _ := c.config.getStringArrayValue([]string{"imports"})
 
 	requiredImport := c.importPattern(dropInFilename)
 	for _, currentImport := range currentImports {

tests/e2e/Makefile

@@ -25,6 +25,7 @@ GINKGO_BIN := $(CURDIR)/bin/ginkgo
 # - nvidia-container-cli
 # - docker
 # - nvidia-cdi-refresh
+# - containerd
 GINKGO_FOCUS ?=
 
 test: $(GINKGO_BIN)

tests/e2e/installer.go

@@ -62,11 +62,49 @@ docker run --pid=host --rm -i --privileged	\
 	--restart-mode=systemd
 `
 
+// containerdInstallTemplate is a template for installing the NVIDIA Container Toolkit
+// on a host using containerd with drop-in configuration support.
+var containerdInstallTemplate = `
+set -xe
+
+# if the TEMP_DIR is already set, use it
+if [ -f /tmp/ctk_e2e_temp_dir.txt ]; then
+    TEMP_DIR=$(cat /tmp/ctk_e2e_temp_dir.txt)
+else
+    TEMP_DIR="/tmp/ctk_e2e.$(date +%s)_$RANDOM"
+    echo "$TEMP_DIR" > /tmp/ctk_e2e_temp_dir.txt
+fi
+
+# if TEMP_DIR does not exist, create it
+if [ ! -d "$TEMP_DIR" ]; then
+    mkdir -p "$TEMP_DIR"
+fi
+
+# Create the drop-in config directory if it doesn't exist
+mkdir -p /etc/containerd/conf.d || true
+
+docker run --pid=host --rm -i --privileged \
+    -v /:/host \
+    -v "$TEMP_DIR:$TEMP_DIR" \
+    -v /etc/containerd:/config-root \
+    {{.Image}} \
+    --root "$TEMP_DIR/toolkit" \
+    --runtime=containerd \
+    --config=/config-root/config.toml \
+    --drop-in-config=/config-root/conf.d/99-nvidia.toml \
+    --drop-in-config-host-path=/etc/containerd/conf.d/99-nvidia.toml \
+    --driver-root=/ \
+    --no-daemon \
+    --restart-mode=none{{if .AdditionalFlags}} \
+    {{.AdditionalFlags}}{{end}}
+`
+
 type ToolkitInstaller struct {
 	runner   Runner
 	template string
 
-	Image string
+	Image           string
+	AdditionalFlags string
 }
 
 type installerOption func(*ToolkitInstaller)
@@ -89,6 +127,12 @@ func WithTemplate(template string) installerOption {
 	}
 }
 
+func WithAdditionalFlags(flags string) installerOption {
+	return func(i *ToolkitInstaller) {
+		i.AdditionalFlags = flags
+	}
+}
+
 func NewToolkitInstaller(opts ...installerOption) (*ToolkitInstaller, error) {
 	i := &ToolkitInstaller{
 		runner:   localRunner{},

tests/e2e/nvidia-cdi-refresh_test.go

@@ -19,8 +19,8 @@ package e2e
 import (
 	"context"
 	"fmt"
-	"html/template"
 	"strings"
+	"text/template"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"

tests/e2e/nvidia-container-cli_test.go

@@ -42,8 +42,8 @@ curl -fsSL http://cdimage.ubuntu.com/ubuntu-base/releases/22.04/release/ubuntu-b
 }
 
 # Enter a new mount + PID namespace so we can pivot_root without touching the
-# container'\''s original filesystem.
-unshare --mount --pid --fork --propagation private -- sh -eux <<'\''IN_NS'\''
+# container's original filesystem.
+unshare --mount --pid --fork --propagation private -- sh -eux <<'IN_NS'
   : "${ROOTFS:?}"
 
   # 1 Bind-mount the new root and make the mount private