Added runtime classes for crun/wasm/nvidia

Signed-off-by: Vitor Savian <[email protected]> Added default runtime flag Signed-off-by: Vitor Savian <[email protected]>
dereknola · Dec 8, 2023 · 03532f7 · 03532f7
1 parent 9c6ba42
commit 03532f7
Show file tree

Hide file tree

Showing 14 changed files with 799 additions and 576 deletions.
diff --git a/manifests/runtimes.yaml b/manifests/runtimes.yaml
@@ -0,0 +1,59 @@
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: nvidia
+handler: nvidia
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: nvidia-experimental
+handler: nvidia-experimental
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: crun
+handler: crun
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: lunatic
+handler: lunatic
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: slight
+handler: slight
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: spin
+handler: spin
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: wws
+handler: wws
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: wasmedge
+handler: wasmedge
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: wasmer
+handler: wasmer
+---
+apiVersion: node.k8s.io/v1
+kind: RuntimeClass
+metadata:
+  name: wasmtime
+handler: wasmtime
diff --git a/pkg/agent/containerd/config_linux.go b/pkg/agent/containerd/config_linux.go
@@ -60,9 +60,12 @@ func setupContainerdConfig(ctx context.Context, cfg *config.Node) error {
 		cfg.AgentConfig.Systemd = !isRunningInUserNS && controllers["cpuset"] && os.Getenv("INVOCATION_ID") != ""
 	}
 
-	extraRuntimes := runtimeConfigs{}
-	findNvidiaContainerRuntimes(os.DirFS(string(os.PathSeparator)), extraRuntimes)
-	findWasiRuntimes(os.DirFS(string(os.PathSeparator)), extraRuntimes)
+	extraRuntimes := findContainerRuntimes(os.DirFS(string(os.PathSeparator)))
+
+	// Verifies if the DefaultRuntime can be found
+	if _, ok := extraRuntimes[cfg.DefaultRuntime]; !ok && cfg.DefaultRuntime != "" {
+		return errors.Errorf("default runtime %s was not found", cfg.DefaultRuntime)
+	}
 
 	var containerdTemplate string
 	containerdConfig := templates.ContainerdConfig{

diff --git a/pkg/agent/containerd/nvidia.go b/pkg/agent/containerd/nvidia.go
diff --git a/pkg/agent/containerd/nvidia_test.go b/pkg/agent/containerd/nvidia_test.go