fix: use correct wasm shims names

Fix the wasm shim detection and the containerd configuration generation. Prior to this commit, the binary and the `RuntimeType` values were not correct. Signed-off-by: Flavio Castelli <fcastelli@suse.com>

fix: use correct wasm shims names
64e4f0e6 · Flavio Castelli · Brad Davidson · 2c4773a5 · 64e4f0e6 · 64e4f0e6
Commit 64e4f0e6 authored Feb 16, 2024 by Flavio Castelli Committed by Brad Davidson Mar 05, 2024
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 16 deletions

runtimes.go pkg/agent/containerd/runtimes.go +7 -7

runtimes_test.go pkg/agent/containerd/runtimes_test.go +9 -9

No files found.
--- a/pkg/agent/containerd/runtimes.go
+++ b/pkg/agent/containerd/runtimes.go
@@ -79,31 +79,31 @@ func findNvidiaContainerRuntimes(foundRuntimes runtimeConfigs) {
 func findWasiRuntimes(foundRuntimes runtimeConfigs) {
 	potentialRuntimes := runtimeConfigs{
 		"lunatic": {
-			RuntimeType: "io.containerd.lunatic.v2",
+			RuntimeType: "io.containerd.lunatic.v1",
 			BinaryName:  "containerd-shim-lunatic-v1",
 		},
 		"slight": {
-			RuntimeType: "io.containerd.slight.v2",
+			RuntimeType: "io.containerd.slight.v1",
 			BinaryName:  "containerd-shim-slight-v1",
 		},
 		"spin": {
 			RuntimeType: "io.containerd.spin.v2",
-			BinaryName:  "containerd-shim-spin-v1",
+			BinaryName:  "containerd-shim-spin-v2",
 		},
 		"wws": {
-			RuntimeType: "io.containerd.wws.v2",
+			RuntimeType: "io.containerd.wws.v1",
 			BinaryName:  "containerd-shim-wws-v1",
 		},
 		"wasmedge": {
-			RuntimeType: "io.containerd.wasmedge.v2",
+			RuntimeType: "io.containerd.wasmedge.v1",
 			BinaryName:  "containerd-shim-wasmedge-v1",
 		},
 		"wasmer": {
-			RuntimeType: "io.containerd.wasmer.v2",
+			RuntimeType: "io.containerd.wasmer.v1",
 			BinaryName:  "containerd-shim-wasmer-v1",
 		},
 		"wasmtime": {
-			RuntimeType: "io.containerd.wasmtime.v2",
+			RuntimeType: "io.containerd.wasmtime.v1",
 			BinaryName:  "containerd-shim-wasmtime-v1",
 		},
 	}

--- a/pkg/agent/containerd/runtimes_test.go
+++ b/pkg/agent/containerd/runtimes_test.go
@@ -44,7 +44,7 @@ func Test_UnitFindContainerRuntimes(t *testing.T) {
 					BinaryName:  "/tmp/testExecutables/crun",
 				},
 				"lunatic": {
-					RuntimeType: "io.containerd.lunatic.v2",
+					RuntimeType: "io.containerd.lunatic.v1",
 					BinaryName:  "/tmp/testExecutables/containerd-shim-lunatic-v1",
 				},
 			},
@@ -57,7 +57,7 @@ func Test_UnitFindContainerRuntimes(t *testing.T) {
 					"containerd-shim-wasmtime-v1",
 					"containerd-shim-lunatic-v1",
 					"containerd-shim-slight-v1",
-					"containerd-shim-spin-v1",
+					"containerd-shim-spin-v2",
 					"containerd-shim-wws-v1",
 					"containerd-shim-wasmedge-v1",
 					"containerd-shim-wasmer-v1",
@@ -65,31 +65,31 @@ func Test_UnitFindContainerRuntimes(t *testing.T) {
 			},
 			want: runtimeConfigs{
 				"wasmtime": {
-					RuntimeType: "io.containerd.wasmtime.v2",
+					RuntimeType: "io.containerd.wasmtime.v1",
 					BinaryName:  "/tmp/testExecutables/containerd-shim-wasmtime-v1",
 				},
 				"lunatic": {
-					RuntimeType: "io.containerd.lunatic.v2",
+					RuntimeType: "io.containerd.lunatic.v1",
 					BinaryName:  "/tmp/testExecutables/containerd-shim-lunatic-v1",
 				},
 				"slight": {
-					RuntimeType: "io.containerd.slight.v2",
+					RuntimeType: "io.containerd.slight.v1",
 					BinaryName:  "/tmp/testExecutables/containerd-shim-slight-v1",
 				},
 				"spin": {
 					RuntimeType: "io.containerd.spin.v2",
-					BinaryName:  "/tmp/testExecutables/containerd-shim-spin-v1",
+					BinaryName:  "/tmp/testExecutables/containerd-shim-spin-v2",
 				},
 				"wws": {
-					RuntimeType: "io.containerd.wws.v2",
+					RuntimeType: "io.containerd.wws.v1",
 					BinaryName:  "/tmp/testExecutables/containerd-shim-wws-v1",
 				},
 				"wasmedge": {
-					RuntimeType: "io.containerd.wasmedge.v2",
+					RuntimeType: "io.containerd.wasmedge.v1",
 					BinaryName:  "/tmp/testExecutables/containerd-shim-wasmedge-v1",
 				},
 				"wasmer": {
-					RuntimeType: "io.containerd.wasmer.v2",
+					RuntimeType: "io.containerd.wasmer.v1",
 					BinaryName:  "/tmp/testExecutables/containerd-shim-wasmer-v1",
 				},
 			},