fix some logs

Signed-off-by: AiRanthem <[email protected]>
openkruise · Dec 25, 2024 · cda1e9b · cda1e9b
1 parent 5faf642
commit cda1e9b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/pkg/controller/workloadspread/workloadspread_controller.go b/pkg/controller/workloadspread/workloadspread_controller.go
@@ -281,7 +281,6 @@ func (r *ReconcileWorkloadSpread) getReplicasPathList(ws *appsv1alpha1.WorkloadS
 		return nil, nil
 	}
 	if ws.Spec.TargetFilter != nil && len(ws.Spec.TargetFilter.ReplicasPathList) > 0 {
-		klog.V(5).InfoS("found replicas path list in target filter", "replicasPathList", ws.Spec.TargetFilter.ReplicasPathList, "workloadSpread", klog.KObj(ws))
 		return ws.Spec.TargetFilter.ReplicasPathList, nil
 	}
 	whiteList, err := configuration.GetWSWatchCustomWorkloadWhiteList(r.Client)
@@ -335,7 +334,7 @@ func (r *ReconcileWorkloadSpread) getPodsForWorkloadSpread(ws *appsv1alpha1.Work
 }
 
 func (r *ReconcileWorkloadSpread) filterWorkload(ws *appsv1alpha1.WorkloadSpread, pods []*corev1.Pod, replicas int32) (int32, []*corev1.Pod, error) {
-	klog.V(5).InfoS("before workload filtering", "pods", len(pods), "replicas", replicas)
+	klog.V(5).InfoS("before workload filtering", "pods", len(pods), "replicas", replicas, "workloadSpread", klog.KObj(ws))
 	replicasPathList, err := r.getReplicasPathList(ws)
 	if err != nil {
 		return replicas, pods, err
@@ -359,10 +358,11 @@ func (r *ReconcileWorkloadSpread) filterWorkload(ws *appsv1alpha1.WorkloadSpread
 			}
 			filteredReplicas += n
 		}
-		klog.V(4).InfoS("replicas after filtering", "replicas", filteredReplicas, "replicasPathList", replicasPathList)
+		klog.V(4).InfoS("replicas after filtering", "replicas", filteredReplicas,
+			"replicasPathList", replicasPathList, "workloadSpread", klog.KObj(ws))
 	} else {
 		filteredReplicas = replicas
-		klog.V(4).InfoS("replicas not filtered")
+		klog.V(4).InfoS("replicas not filtered", "workloadSpread", klog.KObj(ws))
 	}
 	var filteredPods []*corev1.Pod
 	if ws.Spec.TargetFilter != nil && ws.Spec.TargetFilter.Selector != nil {
@@ -378,7 +378,6 @@ func (r *ReconcileWorkloadSpread) filterWorkload(ws *appsv1alpha1.WorkloadSpread
 		klog.V(4).InfoS("pods after filtering", "pods", len(filteredPods), "selector", ws.Spec.TargetFilter.Selector)
 	} else {
 		filteredPods = pods
-		klog.V(4).InfoS("pods not filtered")
 	}
 	return filteredReplicas, filteredPods, nil
 }
@@ -391,7 +390,7 @@ func (r *ReconcileWorkloadSpread) filterWorkload(ws *appsv1alpha1.WorkloadSpread
 // mainly counts missingReplicas and records the creation or deletion entry of Pod into map.
 func (r *ReconcileWorkloadSpread) syncWorkloadSpread(ws *appsv1alpha1.WorkloadSpread) error {
 	if ws.Spec.TargetReference == nil {
-		klog.InfoS("WorkloadSpread has no target reference")
+		klog.InfoS("WorkloadSpread has no target reference", "workloadSpread", klog.KObj(ws))
 		return nil
 	}
 	pods, workloadReplicas, err := r.getPodsForWorkloadSpread(ws)

diff --git a/pkg/util/controllerfinder/controller_finder.go b/pkg/util/controllerfinder/controller_finder.go
@@ -37,7 +37,6 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	scaleclient "k8s.io/client-go/scale"
-	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
@@ -516,7 +515,6 @@ func (r *ControllerFinder) getRefUID(ref ControllerReference, namespace string)
 	if err != nil {
 		return nil, client.IgnoreNotFound(err)
 	}
-	klog.V(5).InfoS("get ref UID success", "uid", un.GetUID(), "ref", klog.KObj(un))
 	return &ScaleAndSelector{
 		Scale: ReplicasUnknown,
 		ControllerReference: ControllerReference{

diff --git a/pkg/util/controllerfinder/pods_finder.go b/pkg/util/controllerfinder/pods_finder.go
@@ -18,6 +18,7 @@ package controllerfinder
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/openkruise/kruise/pkg/util"
 	utilclient "github.com/openkruise/kruise/pkg/util/client"
@@ -91,7 +92,8 @@ func (r *ControllerFinder) GetPodsForRef(apiVersion, kind, ns, name string, acti
 		labelSelector = obj.Selector
 		workloadUIDs = append(workloadUIDs, obj.UID)
 	}
-	klog.V(5).InfoS("find pods and replicas result", "workloadReplicas", workloadReplicas, "workloadUIDs", workloadUIDs, "labelSelector", labelSelector)
+	klog.V(5).InfoS("find pods and replicas result", "target", fmt.Sprintf("%s/%s", ns, name), "kind", kind,
+		"workloadReplicas", workloadReplicas, "workloadUIDs", workloadUIDs, "labelSelector", labelSelector)
 	if workloadReplicas == 0 {
 		return nil, workloadReplicas, nil
 	}
@@ -121,7 +123,8 @@ func (r *ControllerFinder) GetPodsForRef(apiVersion, kind, ns, name string, acti
 			FieldSelector: fields.SelectorFromSet(fields.Set{fieldindex.IndexNameForOwnerRefUID: string(uid)}),
 		}
 		pods, err := listPods(&listOption)
-		klog.V(5).InfoS("result of list pods with owner ref uid", "pods", len(pods), "err", err, "refUid", uid)
+		klog.V(5).InfoS("result of list pods with owner ref uid",
+			"target", fmt.Sprintf("%s/%s", ns, name), "kind", kind, "pods", len(pods), "err", err, "refUid", uid)
 		if err != nil {
 			return nil, -1, err
 		}

diff --git a/pkg/util/workloadspread/utils.go b/pkg/util/workloadspread/utils.go
@@ -1,5 +1,5 @@
 /*
-Copyright 2021 The Kruise Authors.
+Copyright 2024 The Kruise Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.