From aebcec080b2a0142e67d668fd1c37c070706a8bc Mon Sep 17 00:00:00 2001 From: "wangjianyu.wjy" Date: Thu, 23 May 2024 16:37:50 +0800 Subject: [PATCH] scheduler: support nil reservation affinity Signed-off-by: wangjianyu.wjy --- apis/extension/reservation.go | 6 +++++- pkg/util/reservation/reservation.go | 3 --- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/apis/extension/reservation.go b/apis/extension/reservation.go index cced21860..b43d4335a 100644 --- a/apis/extension/reservation.go +++ b/apis/extension/reservation.go @@ -111,8 +111,12 @@ func IsReservationAllocateOnce(r *schedulingv1alpha1.Reservation) bool { } func GetReservationAffinity(annotations map[string]string) (*ReservationAffinity, error) { + s, ok := annotations[AnnotationReservationAffinity] + if !ok { + return nil, nil + } var affinity ReservationAffinity - if s := annotations[AnnotationReservationAffinity]; s != "" { + if s != "" { if err := json.Unmarshal([]byte(s), &affinity); err != nil { return nil, err } diff --git a/pkg/util/reservation/reservation.go b/pkg/util/reservation/reservation.go index cd31c3c83..d22bfbbd2 100644 --- a/pkg/util/reservation/reservation.go +++ b/pkg/util/reservation/reservation.go @@ -465,9 +465,6 @@ func GetRequiredReservationAffinity(pod *corev1.Pod) (*RequiredReservationAffini if err != nil { return nil, err } - if len(reservationAffinity.ReservationSelector) == 0 && reservationAffinity.RequiredDuringSchedulingIgnoredDuringExecution == nil { - return nil, nil - } var selector labels.Selector if len(reservationAffinity.ReservationSelector) > 0 { selector = labels.SelectorFromSet(reservationAffinity.ReservationSelector)