Merge pull request #36306 from hex108/fix_kubelet_admit_message

Automatic merge from submit-queue Fix kubelet's PodAdmitResult's message There is no test added for it since it's a straightforward change.

Merge pull request #36306 from hex108/fix_kubelet_admit_message
610e8207 · Kubernetes Submit Queue · GitHub · a2bf827e · dbb715eb · 610e8207
Commit 610e8207 authored Nov 08, 2016 by Kubernetes Submit Queue Committed by GitHub Nov 08, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

predicate.go pkg/kubelet/lifecycle/predicate.go +2 -2

No files found.
--- a/pkg/kubelet/lifecycle/predicate.go
+++ b/pkg/kubelet/lifecycle/predicate.go
@@ -84,7 +84,7 @@ func (w *predicateAdmitHandler) Admit(attrs *PodAdmitAttributes) PodAdmitResult 
 			glog.V(2).Infof("Predicate failed on Pod: %v, for reason: %v", format.Pod(pod), message)
 		case *predicates.InsufficientResourceError:
 			reason = fmt.Sprintf("OutOf%s", re.ResourceName)
-			message := re.Error()
+			message = re.Error()
 			glog.V(2).Infof("Predicate failed on Pod: %v, for reason: %v", format.Pod(pod), message)
 		case *predicates.FailureReason:
 			reason = re.GetReason()
@@ -92,7 +92,7 @@ func (w *predicateAdmitHandler) Admit(attrs *PodAdmitAttributes) PodAdmitResult 
 			glog.V(2).Infof("Predicate failed on Pod: %v, for reason: %v", format.Pod(pod), message)
 		default:
 			reason = "UnexpectedPredicateFailureType"
-			message := fmt.Sprintf("GeneralPredicates failed due to %v, which is unexpected.", r)
+			message = fmt.Sprintf("GeneralPredicates failed due to %v, which is unexpected.", r)
 			glog.Warningf("Failed to admit pod %v - %s", format.Pod(pod), message)
 		}
 		return PodAdmitResult{