scheduler: support nil reservation affinity

Signed-off-by: wangjianyu.wjy <wangjianyu.wjy@alibaba-inc.com>
koordinator-sh · May 23, 2024 · aebcec0 · aebcec0
1 parent f5b611f
commit aebcec0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -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)