feat(containerd): support 2.x

Signed-off-by: Vaughn Dice <[email protected]>

Author: vdice

.github/workflows/helm-chart-smoketest.yml

@@ -4,10 +4,7 @@ on:
   workflow_call:
 
 env:
-  # TODO: bump to a more recent K8S_VERSION once rcm supports containerd 2.0+
-  # see https://github.com/spinframework/runtime-class-manager/issues/371
-  # For k3d in particular, containerd 2.0 is used starting with k3s image tag v1.32.2-k3s1
-  K8S_VERSION: v1.32.1
+  K8S_VERSION: v1.32.3
   MICROK8S_CHANNEL: 1.32/stable
   SHIM_SPIN_VERSION: v0.19.0
   DOCKER_BUILD_SUMMARY: false

internal/containerd/configure.go

@@ -49,8 +49,6 @@ func (c *Config) AddRuntime(shimPath string) error {
 	runtimeName := shim.RuntimeName(path.Base(shimPath))
 	l := slog.With("runtime", runtimeName)
 
-	cfg := generateConfig(shimPath, runtimeName)
-
 	// Containerd config file needs to exist, otherwise return the error
 	data, err := afero.ReadFile(c.hostFs, c.configPath)
 	if err != nil {
@@ -63,6 +61,8 @@ func (c *Config) AddRuntime(shimPath string) error {
 		return nil
 	}
 
+	cfg := generateConfig(shimPath, runtimeName, data)
+
 	// Open file in append mode
 	file, err := c.hostFs.OpenFile(c.configPath, os.O_APPEND|os.O_WRONLY, 0o644) //nolint:mnd // file permissions
 	if err != nil {
@@ -83,8 +83,6 @@ func (c *Config) RemoveRuntime(shimPath string) (changed bool, err error) {
 	runtimeName := shim.RuntimeName(path.Base(shimPath))
 	l := slog.With("runtime", runtimeName)
 
-	cfg := generateConfig(shimPath, runtimeName)
-
 	// Containerd config file needs to exist, otherwise return the error
 	data, err := afero.ReadFile(c.hostFs, c.configPath)
 	if err != nil {
@@ -97,6 +95,8 @@ func (c *Config) RemoveRuntime(shimPath string) (changed bool, err error) {
 		return false, nil
 	}
 
+	cfg := generateConfig(shimPath, runtimeName, data)
+
 	// Convert the file data to a string and replace the target string with an empty string.
 	modifiedData := strings.ReplaceAll(string(data), cfg, "")
 
@@ -113,10 +113,17 @@ func (c *Config) RestartRuntime() error {
 	return c.restarter.Restart()
 }
 
-func generateConfig(shimPath string, runtimeName string) string {
+func generateConfig(shimPath string, runtimeName string, configData []byte) string {
+	// Config domain for containerd 1.0 (config version 2)
+	domain := "io.containerd.grpc.v1.cri"
+	if strings.Contains(string(configData), "version = 3") {
+		// Config domain for containerd 2.0 (config version 3)
+		domain = "io.containerd.cri.v1.runtime"
+	}
+
 	return fmt.Sprintf(`
 # RCM runtime config for %s
-[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.%s]
+[plugins."%s".containerd.runtimes.%s]
 runtime_type = "%s"
-`, runtimeName, runtimeName, shimPath)
+`, runtimeName, domain, runtimeName, shimPath)
 }

internal/containerd/configure_test.go

@@ -201,3 +201,58 @@ func TestConfig_RemoveRuntime(t *testing.T) {
 		})
 	}
 }
+
+func TestGenerateConfig_ContainerdVersions(t *testing.T) {
+	type fields struct {
+		hostFs     afero.Fs
+		configPath string
+	}
+	type args struct {
+		shimPath string
+	}
+	tests := []struct {
+		name            string
+		fields          fields
+		args            args
+		wantErr         bool
+		wantFileContent string
+	}{
+		{"containerd 1.x", fields{
+			hostFs:     tests.FixtureFs("../../testdata/node-installer/containerd/1.x"),
+			configPath: "/etc/containerd/config.toml",
+		}, args{"/opt/rcm/bin/containerd-shim-spin-v1"}, false, `version = 2
+# RCM runtime config for spin-v1
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin-v1]
+runtime_type = "/opt/rcm/bin/containerd-shim-spin-v1"
+`},
+		{"containerd 2.x", fields{
+			hostFs:     tests.FixtureFs("../../testdata/node-installer/containerd/2.x"),
+			configPath: "/etc/containerd/config.toml",
+		}, args{"/opt/rcm/bin/containerd-shim-spin-v1"}, false, `version = 3
+# RCM runtime config for spin-v1
+[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.spin-v1]
+runtime_type = "/opt/rcm/bin/containerd-shim-spin-v1"
+`},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			c := &Config{
+				hostFs:     tt.fields.hostFs,
+				configPath: tt.fields.configPath,
+			}
+			err := c.AddRuntime(tt.args.shimPath)
+
+			if tt.wantErr {
+				require.Error(t, err)
+				return
+			}
+
+			require.NoError(t, err)
+
+			gotContent, err := afero.ReadFile(c.hostFs, c.configPath)
+			require.NoError(t, err)
+
+			assert.Equal(t, tt.wantFileContent, string(gotContent))
+		})
+	}
+}

testdata/node-installer/containerd/1.x/etc/containerd/config.toml

@@ -0,0 +1 @@
+version = 2

testdata/node-installer/containerd/2.x/etc/containerd/config.toml

@@ -0,0 +1 @@
+version = 3