Merge pull request kubernetes#43652 from Random-Liu/avoid-kubelet-panic

Kubernetes Submit Queue · web-flow · commit 5fd0566ce702 · 2017-03-24T22:16:21.000-07:00
Automatic merge from submit-queue (batch tested with PRs 43653, 43654, 43652) CRI: Check nil pointer to avoid kubelet panic. When working on the containerd kubernetes integration, I casually returns an empty `sandboxStatus.Linux{}`, but it cause kubelet to panic. This won't happen when runtime returns valid data, but we should not make the assumption here. /cc @yujuhong @feiskyer
diff --git a/pkg/kubelet/kuberuntime/kuberuntime_manager.go b/pkg/kubelet/kuberuntime/kuberuntime_manager.go
@@ -386,7 +386,7 @@ func (m *kubeGenericRuntimeManager) podSandboxChanged(pod *v1.Pod, podStatus *ku
 	}
 
 	// Needs to create a new sandbox when network namespace changed.
-	if sandboxStatus.Linux != nil && sandboxStatus.Linux.Namespaces.Options != nil &&
+	if sandboxStatus.Linux != nil && sandboxStatus.Linux.Namespaces != nil && sandboxStatus.Linux.Namespaces.Options != nil &&
 		sandboxStatus.Linux.Namespaces.Options.HostNetwork != kubecontainer.IsHostNetworkPod(pod) {
 		glog.V(2).Infof("Sandbox for pod %q has changed. Need to start a new one", format.Pod(pod))
 		return true, sandboxStatus.Metadata.Attempt + 1, ""

Original file line number	Diff line number	Diff line change
`@@ -386,7 +386,7 @@ func (m kubeGenericRuntimeManager) podSandboxChanged(pod v1.Pod, podStatus *ku`
`386`	`386`	`}`
`387`	`387`
`388`	`388`	`// Needs to create a new sandbox when network namespace changed.`
`389`		`- if sandboxStatus.Linux != nil && sandboxStatus.Linux.Namespaces.Options != nil &&`
	`389`	`+ if sandboxStatus.Linux != nil && sandboxStatus.Linux.Namespaces != nil && sandboxStatus.Linux.Namespaces.Options != nil &&`
`390`	`390`	`sandboxStatus.Linux.Namespaces.Options.HostNetwork != kubecontainer.IsHostNetworkPod(pod) {`
`391`	`391`	`glog.V(2).Infof("Sandbox for pod %q has changed. Need to start a new one", format.Pod(pod))`
`392`	`392`	`return true, sandboxStatus.Metadata.Attempt + 1, ""`