scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix kubelet's PodAdmitResult's message

Browse Source
This commit is contained in:
Jun Gong
2016-11-06 18:29:26 +08:00
parent 6f053ec4bc
commit dbb715eb42
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/lifecycle/predicate.go
View File

@@ -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) glog.V(2).Infof("Predicate failed on Pod: %v, for reason: %v", format.Pod(pod), message)
case *predicates.InsufficientResourceError: case *predicates.InsufficientResourceError:
reason = fmt.Sprintf("OutOf%s", re.ResourceName) 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) glog.V(2).Infof("Predicate failed on Pod: %v, for reason: %v", format.Pod(pod), message)
case *predicates.FailureReason: case *predicates.FailureReason:
reason = re.GetReason() 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) glog.V(2).Infof("Predicate failed on Pod: %v, for reason: %v", format.Pod(pod), message)
default: default:
reason = "UnexpectedPredicateFailureType" 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) glog.Warningf("Failed to admit pod %v - %s", format.Pod(pod), message)
} }
return PodAdmitResult{ return PodAdmitResult{