github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #99292 from yangjunmyfm192085/run-test23

Browse Source 
replace all occurrences of "node", nodeName to "node", klog.KRef("", nodeName)
This commit is contained in:
Kubernetes Prow Robot 2022-03-17 12:22:42 -07:00 committed by GitHub
commit f979b4094e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/controller/nodelifecycle/scheduler/taint_manager.go
View File

@ -350,7 +350,7 @@ func (tc *NoExecuteTaintManager) processPodOnNode(
} }
allTolerated, usedTolerations := v1helper.GetMatchingTolerations(taints, tolerations) allTolerated, usedTolerations := v1helper.GetMatchingTolerations(taints, tolerations)
if !allTolerated { if !allTolerated {
klog.V(2).InfoS("Not all taints are tolerated after update for pod on node", "pod", podNamespacedName.String(), "node", nodeName) klog.V(2).InfoS("Not all taints are tolerated after update for pod on node", "pod", podNamespacedName.String(), "node", klog.KRef("", nodeName))
// We're canceling scheduled work (if any), as we're going to delete the Pod right away. // We're canceling scheduled work (if any), as we're going to delete the Pod right away.
tc.cancelWorkWithEvent(podNamespacedName) tc.cancelWorkWithEvent(podNamespacedName)
tc.taintEvictionQueue.AddWork(ctx, NewWorkArgs(podNamespacedName.Name, podNamespacedName.Namespace), time.Now(), time.Now()) tc.taintEvictionQueue.AddWork(ctx, NewWorkArgs(podNamespacedName.Name, podNamespacedName.Namespace), time.Now(), time.Now())

2
pkg/controller/podgc/gc_controller.go
View File

@ -200,7 +200,7 @@ func (gcc *PodGCController) discoverDeletedNodes(ctx context.Context, existingNo
exists, err := gcc.checkIfNodeExists(ctx, nodeName) exists, err := gcc.checkIfNodeExists(ctx, nodeName)
switch { switch {
case err != nil: case err != nil:
klog.ErrorS(err, "Error while getting node", "node", nodeName) klog.ErrorS(err, "Error while getting node", "node", klog.KRef("", nodeName))
// Node will be added back to the queue in the subsequent loop if still needed // Node will be added back to the queue in the subsequent loop if still needed
case !exists: case !exists:
deletedNodesNames.Insert(nodeName) deletedNodesNames.Insert(nodeName)

4
pkg/controller/util/node/controller_utils.go
View File

@ -117,7 +117,7 @@ func SetPodTerminationReason(ctx context.Context, kubeClient clientset.Interface
// MarkPodsNotReady updates ready status of given pods running on // MarkPodsNotReady updates ready status of given pods running on
// given node from master return true if success // given node from master return true if success
func MarkPodsNotReady(ctx context.Context, kubeClient clientset.Interface, recorder record.EventRecorder, pods []*v1.Pod, nodeName string) error { func MarkPodsNotReady(ctx context.Context, kubeClient clientset.Interface, recorder record.EventRecorder, pods []*v1.Pod, nodeName string) error {
klog.V(2).InfoS("Update ready status of pods on node", "node", nodeName) klog.V(2).InfoS("Update ready status of pods on node", "node", klog.KRef("", nodeName))
errs := []error{} errs := []error{}
for i := range pods { for i := range pods {
@ -165,7 +165,7 @@ func RecordNodeEvent(recorder record.EventRecorder, nodeName, nodeUID, eventtype
UID: types.UID(nodeUID), UID: types.UID(nodeUID),
Namespace: "", Namespace: "",
} }
klog.V(2).InfoS("Recording event message for node", "event", event, "node", nodeName) klog.V(2).InfoS("Recording event message for node", "event", event, "node", klog.KRef("", nodeName))
recorder.Eventf(ref, eventtype, reason, "Node %s event: %s", nodeName, event) recorder.Eventf(ref, eventtype, reason, "Node %s event: %s", nodeName, event)
} }

2
pkg/scheduler/framework/plugins/defaultbinder/default_binder.go
View File

@ -49,7 +49,7 @@ func (b DefaultBinder) Name() string {
// Bind binds pods to nodes using the k8s client. // Bind binds pods to nodes using the k8s client.
func (b DefaultBinder) Bind(ctx context.Context, state *framework.CycleState, p *v1.Pod, nodeName string) *framework.Status { func (b DefaultBinder) Bind(ctx context.Context, state *framework.CycleState, p *v1.Pod, nodeName string) *framework.Status {
klog.V(3).InfoS("Attempting to bind pod to node", "pod", klog.KObj(p), "node", nodeName) klog.V(3).InfoS("Attempting to bind pod to node", "pod", klog.KObj(p), "node", klog.KRef("", nodeName))
binding := &v1.Binding{ binding := &v1.Binding{
ObjectMeta: metav1.ObjectMeta{Namespace: p.Namespace, Name: p.Name, UID: p.UID}, ObjectMeta: metav1.ObjectMeta{Namespace: p.Namespace, Name: p.Name, UID: p.UID},
Target: v1.ObjectReference{Kind: "Node", Name: nodeName}, Target: v1.ObjectReference{Kind: "Node", Name: nodeName},