github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #32836 from yujuhong/fix_nil_ptr

Browse Source 
Automatic merge from submit-queue

kuberuntime: fix nil pointer dereference in killPodWithSyncResult

This fixes #32742
This commit is contained in:
Kubernetes Submit Queue 2016-09-16 09:40:03 -07:00 committed by GitHub
commit e5a84398db
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View File

@ -668,15 +668,15 @@ func (m *kubeGenericRuntimeManager) killPodWithSyncResult(pod *api.Pod, runningP
return return
} }
if !isHostNetwork { if !isHostNetwork {
teardownNetworkResult := kubecontainer.NewSyncResult(kubecontainer.TeardownNetwork, pod.UID) teardownNetworkResult := kubecontainer.NewSyncResult(kubecontainer.TeardownNetwork, runningPod.ID)
result.AddSyncResult(teardownNetworkResult) result.AddSyncResult(teardownNetworkResult)
// Tear down network plugin with sandbox id // Tear down network plugin with sandbox id
if err := m.networkPlugin.TearDownPod(runningPod.Namespace, runningPod.Name, kubecontainer.ContainerID{ if err := m.networkPlugin.TearDownPod(runningPod.Namespace, runningPod.Name, kubecontainer.ContainerID{
Type: m.runtimeName, Type: m.runtimeName,
ID: sandboxID, ID: sandboxID,
}); err != nil { }); err != nil {
message := fmt.Sprintf("Failed to teardown network for pod %q using network plugins %q: %v", message := fmt.Sprintf("Failed to teardown network for pod %s_%s(%s) using network plugins %q: %v",
format.Pod(pod), m.networkPlugin.Name(), err) runningPod.Name, runningPod.Namespace, runningPod.ID, m.networkPlugin.Name(), err)
teardownNetworkResult.Fail(kubecontainer.ErrTeardownNetwork, message) teardownNetworkResult.Fail(kubecontainer.ErrTeardownNetwork, message)
glog.Error(message) glog.Error(message)
} }