scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 18:58:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change docker/default to runtime/default

Browse Source
This commit is contained in:
Zhen Wang
2018-04-19 10:39:53 -07:00
parent 3856891198
commit e102633ae8
14 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/dockershim/helpers_linux.go
View File

@@ -30,6 +30,7 @@ import (
"github.com/blang/semver"
dockertypes "github.com/docker/docker/api/types"
dockercontainer "github.com/docker/docker/api/types/container"
"k8s.io/api/core/v1"
runtimeapi "k8s.io/kubernetes/pkg/kubelet/apis/cri/runtime/v1alpha2"
)
@@ -53,7 +54,7 @@ func getSeccompDockerOpts(seccompProfile string) ([]dockerOpt, error) {
return defaultSeccompOpt, nil
}
if seccompProfile == "docker/default" {
if seccompProfile == v1.SeccompProfileRuntimeDefault || seccompProfile == v1.DeprecatedSeccompProfileDockerDefault {
// return nil so docker will load the default seccomp profile
return nil, nil
}