From dc8a9ae231dd8691a25910c6e97e8896297008b9 Mon Sep 17 00:00:00 2001 From: Paul Morie Date: Fri, 19 Aug 2016 11:23:19 -0400 Subject: [PATCH] Fix nil in error message due to var shadowing --- pkg/kubelet/status/status_manager.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/status/status_manager.go b/pkg/kubelet/status/status_manager.go index 93e32861d3e..99bbd53b743 100644 --- a/pkg/kubelet/status/status_manager.go +++ b/pkg/kubelet/status/status_manager.go @@ -434,7 +434,7 @@ func (m *manager) syncPod(uid types.UID, status versionedPodStatus) { deleteOptions := api.NewDeleteOptions(0) // Use the pod UID as the precondition for deletion to prevent deleting a newly created pod with the same name and namespace. deleteOptions.Preconditions = api.NewUIDPreconditions(string(pod.UID)) - if err := m.kubeClient.Core().Pods(pod.Namespace).Delete(pod.Name, deleteOptions); err == nil { + if err = m.kubeClient.Core().Pods(pod.Namespace).Delete(pod.Name, deleteOptions); err == nil { glog.V(3).Infof("Pod %q fully terminated and removed from etcd", format.Pod(pod)) m.deletePodStatus(uid) return