Merge pull request #31003 from pmorie/kubelet-status-mgr-shadow

Automatic merge from submit-queue kubelet status manager: Fix nil in error message due to var shadowing Variable shadowing can cause this log message to print a nil: ```go glog.Warningf("Failed to update status for pod %q: %v", format.Pod(pod), err) ``` @kubernetes/rh-cluster-infra

Merge pull request #31003 from pmorie/kubelet-status-mgr-shadow
f4ed73ca · Kubernetes Submit Queue · GitHub · 00751444 · dc8a9ae2 · f4ed73ca
Commit f4ed73ca authored Aug 21, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 21, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

status_manager.go pkg/kubelet/status/status_manager.go +1 -1

No files found.
--- 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