From d5b03dc6d1cb57b9fc33b61c71be4965f2baf71d 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 | 2 +- 2 files changed, 6 insertions(+), 2 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..e48bb5aa2 100644 --- a/pkg/util/reservation/reservation.go +++ b/pkg/util/reservation/reservation.go @@ -465,7 +465,7 @@ func GetRequiredReservationAffinity(pod *corev1.Pod) (*RequiredReservationAffini if err != nil { return nil, err } - if len(reservationAffinity.ReservationSelector) == 0 && reservationAffinity.RequiredDuringSchedulingIgnoredDuringExecution == nil { + if reservationAffinity == nil { return nil, nil } var selector labels.Selector