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

Consistently use log.KObj to format pods in logs

Browse Source
This commit is contained in:
Markus Thömmes
2021-04-22 12:14:44 +02:00
parent 82d8d08c78
commit 168b6cf8a1
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ import (
v1affinityhelper "k8s.io/component-helpers/scheduling/corev1/nodeaffinity" v1affinityhelper "k8s.io/component-helpers/scheduling/corev1/nodeaffinity"
"k8s.io/klog/v2" "k8s.io/klog/v2"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/kubelet/util/format"
schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework" schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodeaffinity"
"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename" "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodename"
@@ -136,11 +135,11 @@ func (w *predicateAdmitHandler) Admit(attrs *PodAdmitAttributes) PodAdmitResult
case *PredicateFailureError: case *PredicateFailureError:
reason = re.PredicateName reason = re.PredicateName
message = re.Error() message = re.Error()
klog.V(2).InfoS("Predicate failed on Pod", "pod", format.Pod(admitPod), "err", message) klog.V(2).InfoS("Predicate failed on Pod", "pod", klog.KObj(admitPod), "err", message)
case *InsufficientResourceError: case *InsufficientResourceError:
reason = fmt.Sprintf("OutOf%s", re.ResourceName) reason = fmt.Sprintf("OutOf%s", re.ResourceName)
message = re.Error() message = re.Error()
klog.V(2).InfoS("Predicate failed on Pod", "pod", format.Pod(admitPod), "err", message) klog.V(2).InfoS("Predicate failed on Pod", "pod", klog.KObj(admitPod), "err", 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)