support RuntimeClass.handler, this will useful like nvidia is not the…

… default runtime

Signed-off-by: zhangguanzhang <zhangguanzhang@qq.com>

core/container_create.go

@@ -67,6 +67,11 @@ func (ds *dockerService) CreateContainer(
 	containerName := makeContainerName(sandboxConfig, config)
 	mounts := config.GetMounts()
 	terminationMessagePath, _ := config.Annotations["io.kubernetes.container.terminationMessagePath"]
+
+	sandboxHostcCofig, err := ds.client.InspectContainer(r.GetPodSandboxId())
+	if err != nil {
+		return nil, fmt.Errorf("unable to get container's sandbox ID: %v", err)
+	}
 	createConfig := dockerbackend.ContainerCreateConfig{
 		Name: containerName,
 		Config: &container.Config{
@@ -91,6 +96,7 @@ func (ds *dockerService) CreateContainer(
 			RestartPolicy: container.RestartPolicy{
 				Name: "no",
 			},
+			Runtime: sandboxHostcCofig.HostConfig.Runtime,
 		},
 	}
 

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,6 @@ 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())
-	}
 	createConfig, err := ds.makeSandboxDockerConfig(containerConfig, image)
 	if err != nil {
 		return nil, fmt.Errorf(
@@ -62,6 +60,11 @@ func (ds *dockerService) RunPodSandbox(
 			err,
 		)
 	}
+	// k8s RuntimeClass.handler=docker will use docker's default runtime
+	runtimeHandler := r.GetRuntimeHandler()
+	if runtimeHandler != "" && runtimeHandler != runtimeName {
+		createConfig.HostConfig.Runtime = runtimeHandler
+	}
 	createResp, err := ds.client.CreateContainer(*createConfig)
 	if err != nil {
 		createResp, err = recoverFromCreationConflictIfNeeded(ds.client, *createConfig, err)