github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Always fallback to the new runtime options.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2019-01-24 00:56:33 -08:00
parent 42aba00a31
commit d9914c8dbd
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/server/helpers.go
View File

@ -41,6 +41,7 @@ import (
"golang.org/x/net/context" "golang.org/x/net/context"
runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2" runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
runtimeoptions "github.com/containerd/cri/pkg/api/runtimeoptions/v1"
criconfig "github.com/containerd/cri/pkg/config" criconfig "github.com/containerd/cri/pkg/config"
"github.com/containerd/cri/pkg/store" "github.com/containerd/cri/pkg/store"
imagestore "github.com/containerd/cri/pkg/store/image" imagestore "github.com/containerd/cri/pkg/store/image"
@ -481,8 +482,10 @@ func getRuntimeOptionsType(t string) interface{} {
switch t { switch t {
case runcRuntime: case runcRuntime:
return &runcoptions.Options{} return &runcoptions.Options{}
default: case linuxRuntime:
return &runctypes.RuncOptions{} return &runctypes.RuncOptions{}
default:
return &runtimeoptions.Options{}
} }
} }