From 95184cc23591884ad6a763716f3bde5134682a31 Mon Sep 17 00:00:00 2001 From: liuyuanchun Date: Wed, 14 Aug 2024 14:46:55 +0800 Subject: [PATCH] fix pg controller create redundancy podGroup when schedulerName isn't matched Signed-off-by: liuyuanchun --- pkg/controllers/podgroup/pg_controller_handler.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/controllers/podgroup/pg_controller_handler.go b/pkg/controllers/podgroup/pg_controller_handler.go index 12541d85a3..226ae347f5 100644 --- a/pkg/controllers/podgroup/pg_controller_handler.go +++ b/pkg/controllers/podgroup/pg_controller_handler.go @@ -19,6 +19,7 @@ package podgroup import ( "context" "encoding/json" + "slices" "strings" appsv1 "k8s.io/api/apps/v1" @@ -87,15 +88,19 @@ func (pg *pgcontroller) addReplicaSet(obj interface{}) { podList, err := pg.kubeClient.CoreV1().Pods(rs.Namespace).List(context.TODO(), metav1.ListOptions{LabelSelector: metav1.FormatLabelSelector(&selector)}) if err != nil { - klog.Errorf("Failed to list pods for ReplicaSet <%s/%s>: %v", rs.Namespace, rs.Name, err) + klog.Errorf("Failed to list pods for ReplicaSet %s: %v", klog.KObj(rs), err) return } if podList != nil && len(podList.Items) > 0 { pod := podList.Items[0] - klog.V(4).Infof("Try to create podgroup for pod %s/%s", pod.Namespace, pod.Name) + klog.V(4).Infof("Try to create podgroup for pod %s", klog.KObj(&pod)) + if !slices.Contains(pg.schedulerNames, pod.Spec.SchedulerName) { + klog.V(4).Infof("Pod %s field SchedulerName is not matched", klog.KObj(&pod)) + return + } err := pg.createNormalPodPGIfNotExist(&pod) if err != nil { - klog.Errorf("Failed to create PodGroup for pod <%s/%s>: %v", pod.Namespace, pod.Name, err) + klog.Errorf("Failed to create PodGroup for pod %s: %v", klog.KObj(&pod), err) } } }