quickfix: propagate runtime

Signed-off-by: Sven Pfennig <[email protected]>

Author: 0xE282B0

core/container_create.go

@@ -65,6 +65,7 @@ func (ds *dockerService) CreateContainer(
 	}
 	containerName := makeContainerName(sandboxConfig, config)
 	terminationMessagePath, _ := config.Annotations["io.kubernetes.container.terminationMessagePath"]
+	json, _, err := ds.getPodSandboxDetails(podSandboxID)
 	createConfig := types.ContainerCreateConfig{
 		Name: containerName,
 		Config: &container.Config{
@@ -89,6 +90,7 @@ func (ds *dockerService) CreateContainer(
 			RestartPolicy: container.RestartPolicy{
 				Name: "no",
 			},
+			Runtime: json.Config.Labels["runtime"],
 		},
 	}
 

core/sandbox_helpers.go

@@ -18,13 +18,14 @@ package core
 
 import (
 	"fmt"
+	"os"
+	"strings"
+	"time"
+
 	"github.com/Mirantis/cri-dockerd/libdocker"
 	"github.com/Mirantis/cri-dockerd/utils"
 	"github.com/Mirantis/cri-dockerd/utils/errors"
 	"k8s.io/kubernetes/pkg/credentialprovider"
-	"os"
-	"strings"
-	"time"
 
 	"github.com/Mirantis/cri-dockerd/config"
 	dockertypes "github.com/docker/docker/api/types"
@@ -55,6 +56,19 @@ var (
 	defaultSandboxGracePeriod = time.Duration(10) * time.Second
 )
 
+func (ds *dockerService) getRuntimeFromRuntimeClassName(runtimeClassName string) string {
+	switch runtimeClassName {
+	case "spin":
+		return "io.containerd.spin.v1"
+	case "wasmedge":
+		return "io.containerd.wasmedge.v1"
+	case "docker":
+		return "docker"
+	default:
+		return ""
+	}
+}
+
 // Returns whether the sandbox network is ready, and whether the sandbox is known
 func (ds *dockerService) getNetworkReady(podSandboxID string) (bool, bool) {
 	ds.networkReadyLock.Lock()

core/sandbox_run.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+
 	"github.com/Mirantis/cri-dockerd/config"
 	"github.com/Mirantis/cri-dockerd/utils/errors"
 	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
@@ -51,9 +52,9 @@ func (ds *dockerService) RunPodSandbox(
 	}
 
 	// Step 2: Create the sandbox container.
-	if r.GetRuntimeHandler() != "" && r.GetRuntimeHandler() != runtimeName {
-		return nil, fmt.Errorf("RuntimeHandler %q not supported", r.GetRuntimeHandler())
-	}
+	//if r.GetRuntimeHandler() != "" && r.GetRuntimeHandler() != runtimeName {
+	//	return nil, fmt.Errorf("RuntimeHandler %q not supported", r.GetRuntimeHandler())
+	//}
 	createConfig, err := ds.makeSandboxDockerConfig(containerConfig, image)
 	if err != nil {
 		return nil, fmt.Errorf(
@@ -62,6 +63,9 @@ func (ds *dockerService) RunPodSandbox(
 			err,
 		)
 	}
+	// Map Kubernetes runtimeClassName to Docker runtime.
+	// TODO: find a better way to pass runtime from K8s Pod to containers
+	createConfig.Config.Labels["runtime"] = ds.getRuntimeFromRuntimeClassName(r.GetRuntimeHandler())
 	createResp, err := ds.client.CreateContainer(*createConfig)
 	if err != nil {
 		createResp, err = recoverFromCreationConflictIfNeeded(ds.client, *createConfig, err)