github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

ProcMount: add dockershim support

Browse Source 
Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
This commit is contained in:
Jess Frazelle 2018-06-14 18:05:18 -04:00 committed by Jess Frazelle
parent 31ffd9f881
commit 20cc40a5dc
No known key found for this signature in database
GPG Key ID: 18F3685C0022BFF3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/dockershim/libdocker/kube_docker_client.go
View File

@ -205,7 +205,7 @@ func (d *kubeDockerClient) inspectImageRaw(ref string) (*dockertypes.ImageInspec
return nil, ctxErr return nil, ctxErr
} }
if err != nil { if err != nil {
if dockerapi.IsErrImageNotFound(err) { if dockerapi.IsErrNotFound(err) {
err = ImageNotFoundError{ID: ref} err = ImageNotFoundError{ID: ref}
} }
return nil, err return nil, err
@ -469,7 +469,7 @@ func (d *kubeDockerClient) StartExec(startExec string, opts dockertypes.ExecStar
} }
return err return err
} }
resp, err := d.client.ContainerExecAttach(ctx, startExec, dockertypes.ExecConfig{ resp, err := d.client.ContainerExecAttach(ctx, startExec, dockertypes.ExecStartCheck{
Detach: opts.Detach, Detach: opts.Detach,
Tty: opts.Tty, Tty: opts.Tty,
}) })

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

@ -137,6 +137,9 @@ func modifyHostConfig(sc *runtimeapi.LinuxContainerSecurityContext, hostConfig *
hostConfig.SecurityOpt = append(hostConfig.SecurityOpt, "no-new-privileges") hostConfig.SecurityOpt = append(hostConfig.SecurityOpt, "no-new-privileges")
} }
hostConfig.MaskedPaths = sc.MaskedPaths
hostConfig.ReadonlyPaths = sc.ReadonlyPaths
return nil return nil
} }