Merge pull request #22043 from medyagh/preload_fix_containerdformat

ci: fix preload config parse for containerd

Author: medyagh

hack/preload-images/preload_images.go

@@ -188,19 +188,35 @@ var verifyContainerdStorage = func() error {
 	if err != nil {
 		return fmt.Errorf("%v: %v:\n%s", cmd.Args, err, stderr.String())
 	}
-	var driver string
-	for _, line := range strings.Split(string(output), "\n") {
-		if strings.Contains(line, "snapshotter = ") {
-			driver = strings.Split(line, " = ")[1]
-			driver = strings.Trim(driver, "\"")
-		}
-	}
+	driver := parseContainerdSnapshotter(string(output))
 	if driver != containerdSnapshotter {
 		return fmt.Errorf("containerd snapshotter %s does not match requested %s", driver, containerdSnapshotter)
 	}
 	return nil
 }
 
+func parseContainerdSnapshotter(cfg string) string {
+	var driver string
+	for _, line := range strings.Split(cfg, "\n") {
+		line = strings.TrimSpace(line)
+		if !strings.HasPrefix(line, "snapshotter") { // e.g. snapshotter = "overlayfs" or snapshotter = 'overlayfs'
+			continue
+		}
+		parts := strings.SplitN(line, "=", 2)
+		if len(parts) != 2 {
+			continue
+		}
+		val := strings.Trim(strings.TrimSpace(parts[1]), "\"'")
+		if val == "" {
+			continue
+		}
+		if driver == "" {
+			driver = val
+		}
+	}
+	return driver
+}
+
 var verifyPodmanStorage = func() error {
 	cmd := exec.Command("docker", "exec", profile, "sudo", "podman", "info", "-f", "json")
 	var stderr bytes.Buffer

hack/preload-images/preload_images_test.go

@@ -0,0 +1,58 @@
+package main
+
+import "testing"
+
+const containerd2Config = `version = 3
+root = '/var/lib/containerd'
+
+[plugins]
+  [plugins.'io.containerd.cri.v1.images']
+    snapshotter = 'overlayfs'
+
+  [plugins.'io.containerd.cri.v1.runtime'.containerd]
+      [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes]
+        [plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.runc]
+          snapshotter = ''
+`
+
+const containerd17Config = `disabled_plugins = []
+imports = ["/etc/containerd/config.toml"]
+oom_score = 0
+plugin_dir = ""
+required_plugins = []
+root = "/var/lib/containerd"
+state = "/run/containerd"
+temp = ""
+version = 2
+
+[plugins]
+
+  [plugins."io.containerd.grpc.v1.cri"]
+    [plugins."io.containerd.grpc.v1.cri".containerd]
+      snapshotter = "overlayfs"
+
+      [plugins."io.containerd.grpc.v1.cri".containerd.runtimes]
+
+        [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+          snapshotter = ""
+`
+
+func TestParseContainerdSnapshotterCases(t *testing.T) {
+	tcs := []struct {
+		name string
+		cfg  string
+		want string
+	}{
+		{name: "v2 config with single quotes", cfg: containerd2Config, want: "overlayfs"},
+		{name: "v1.7 config with double quotes", cfg: containerd17Config, want: "overlayfs"},
+		{name: "single line double quotes", cfg: "snapshotter = \"overlayfs\"\n", want: "overlayfs"},
+	}
+	for _, tc := range tcs {
+		tc := tc
+		t.Run(tc.name, func(t *testing.T) {
+			if got := parseContainerdSnapshotter(tc.cfg); got != tc.want {
+				t.Fatalf("expected %q, got %q", tc.want, got)
+			}
+		})
+	}
+}