From e5b3e0879dbfdf674aabb9838f34fdefa07b4617 Mon Sep 17 00:00:00 2001 From: Xianglin Gao Date: Fri, 31 Mar 2017 14:14:10 +0800 Subject: [PATCH] make func modifySandboxNamespaceOptions() more robust Signed-off-by: Xianglin Gao --- pkg/kubelet/dockershim/security_context.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/dockershim/security_context.go b/pkg/kubelet/dockershim/security_context.go index 0b9f3392a5b..f5ba3a39d0b 100644 --- a/pkg/kubelet/dockershim/security_context.go +++ b/pkg/kubelet/dockershim/security_context.go @@ -109,8 +109,12 @@ func modifyHostConfig(sc *runtimeapi.LinuxContainerSecurityContext, hostConfig * // modifySandboxNamespaceOptions apply namespace options for sandbox func modifySandboxNamespaceOptions(nsOpts *runtimeapi.NamespaceOption, hostConfig *dockercontainer.HostConfig, network *knetwork.PluginManager) { + hostNetwork := false + if nsOpts != nil { + hostNetwork = nsOpts.HostNetwork + } modifyCommonNamespaceOptions(nsOpts, hostConfig) - modifyHostNetworkOptionForSandbox(nsOpts.HostNetwork, network, hostConfig) + modifyHostNetworkOptionForSandbox(hostNetwork, network, hostConfig) } // modifyContainerNamespaceOptions apply namespace options for container