Skip to content

K
k3s
Commit 023fe48c authored by Pengfei Ni's avatar Pengfei Ni
Browse files
Options

Do not clear hostPid for host-networked container

parent 5812c876
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/dockershim/security_context.go
View file @ 023fe48c
...@@ -167,7 +167,6 @@ func modifyHostNetworkOptionForContainer(hostNetwork bool, sandboxID string, hc ...@@ -167,7 +167,6 @@ func modifyHostNetworkOptionForContainer(hostNetwork bool, sandboxID string, hc
hc.NetworkMode = dockercontainer.NetworkMode(sandboxNSMode) hc.NetworkMode = dockercontainer.NetworkMode(sandboxNSMode)
hc.IpcMode = dockercontainer.IpcMode(sandboxNSMode) hc.IpcMode = dockercontainer.IpcMode(sandboxNSMode)
hc.UTSMode = "" hc.UTSMode = ""
hc.PidMode = ""
if hostNetwork { if hostNetwork {
hc.UTSMode = namespaceModeHost hc.UTSMode = namespaceModeHost
......
pkg/kubelet/dockershim/security_context_test.go
View file @ 023fe48c
...@@ -306,6 +306,7 @@ func TestModifyContainerNamespaceOptions(t *testing.T) { ...@@ -306,6 +306,7 @@ func TestModifyContainerNamespaceOptions(t *testing.T) {
expected: &dockercontainer.HostConfig{ expected: &dockercontainer.HostConfig{
NetworkMode: dockercontainer.NetworkMode(sandboxNSMode), NetworkMode: dockercontainer.NetworkMode(sandboxNSMode),
IpcMode: dockercontainer.IpcMode(sandboxNSMode), IpcMode: dockercontainer.IpcMode(sandboxNSMode),
PidMode: namespaceModeHost,
}, },
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment