Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
20cc40a5
Unverified
Commit
20cc40a5
authored
Jun 14, 2018
by
Jess Frazelle
Committed by
Jess Frazelle
Aug 30, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ProcMount: add dockershim support
Signed-off-by:
Jess Frazelle
<
acidburn@microsoft.com
>
parent
31ffd9f8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
kube_docker_client.go
pkg/kubelet/dockershim/libdocker/kube_docker_client.go
+2
-2
security_context.go
pkg/kubelet/dockershim/security_context.go
+3
-0
No files found.
pkg/kubelet/dockershim/libdocker/kube_docker_client.go
View file @
20cc40a5
...
@@ -205,7 +205,7 @@ func (d *kubeDockerClient) inspectImageRaw(ref string) (*dockertypes.ImageInspec
...
@@ -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
.
IsErr
Image
NotFound
(
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
...
@@ -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
.
Exec
Config
{
resp
,
err
:=
d
.
client
.
ContainerExecAttach
(
ctx
,
startExec
,
dockertypes
.
Exec
StartCheck
{
Detach
:
opts
.
Detach
,
Detach
:
opts
.
Detach
,
Tty
:
opts
.
Tty
,
Tty
:
opts
.
Tty
,
})
})
...
...
pkg/kubelet/dockershim/security_context.go
View file @
20cc40a5
...
@@ -137,6 +137,9 @@ func modifyHostConfig(sc *runtimeapi.LinuxContainerSecurityContext, hostConfig *
...
@@ -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
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment