checkpoint feedback

aws · Feb 26, 2025 · 199602b · 199602b
1 parent 61aa5f5
commit 199602b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 60 deletions.
diff --git a/pkg/providers/capacityreservation/types.go b/pkg/providers/capacityreservation/types.go
@@ -37,10 +37,9 @@ type Query struct {
 
 func QueriesFromSelectorTerms(terms ...v1.CapacityReservationSelectorTerm) []*Query {
 	queries := []*Query{}
-	ids := []string{}
 	for i := range terms {
-		if terms[i].ID != "" {
-			ids = append(ids, terms[i].ID)
+		if id := terms[i].ID; id != "" {
+			queries = append(queries, &Query{ID: id})
 		}
 		if len(terms[i].Tags) != 0 {
 			queries = append(queries, &Query{
@@ -49,9 +48,6 @@ func QueriesFromSelectorTerms(terms ...v1.CapacityReservationSelectorTerm) []*Qu
 			})
 		}
 	}
-	queries = append(queries, lo.Map(ids, func(id string, _ int) *Query {
-		return &Query{ID: id}
-	})...)
 	return queries
 }
 

diff --git a/test/suites/drift/suite_test.go b/test/suites/drift/suite_test.go
@@ -991,7 +991,14 @@ var _ = Describe("Drift", Ordered, func() {
 		})
 		It("should drift nodeclaim when the reservation is no longer selected by the nodeclass", func() {
 			nodeClass.Spec.CapacityReservationSelectorTerms = []v1.CapacityReservationSelectorTerm{{ID: largeCapacityReservationID}}
-			pod := coretest.Pod()
+			// Include the do-not-disrupt annotation to prevent replacement NodeClaims from leaking between tests
+			pod := coretest.Pod(coretest.PodOptions{
+				ObjectMeta: metav1.ObjectMeta{
+					Annotations: map[string]string{
+						karpv1.DoNotDisruptAnnotationKey: "true",
+					},
+				},
+			})
 			env.ExpectCreated(nodePool, nodeClass, pod)
 			nc := env.EventuallyExpectNodeClaimCount("==", 1)[0]
 			env.EventuallyExpectNodeClaimsReady(nc)
@@ -1005,7 +1012,6 @@ var _ = Describe("Drift", Ordered, func() {
 			env.EventuallyExpectDrifted(nc)
 		})
 		It("should drift nodeclaim when the nodeclaim is demoted to on-demand", func() {
-			var canceled bool
 			capacityReservationID := aws.ExpectCapacityReservationCreated(
 				env.Context,
 				env.EC2API,
@@ -1016,9 +1022,7 @@ var _ = Describe("Drift", Ordered, func() {
 				nil,
 			)
 			DeferCleanup(func() {
-				if !canceled {
-					aws.ExpectCapacityReservationsCanceled(env.Context, env.EC2API, capacityReservationID)
-				}
+				aws.ExpectCapacityReservationsCanceled(env.Context, env.EC2API, capacityReservationID)
 			})
 
 			nodeClass.Spec.CapacityReservationSelectorTerms = []v1.CapacityReservationSelectorTerm{{ID: capacityReservationID}}
@@ -1042,7 +1046,6 @@ var _ = Describe("Drift", Ordered, func() {
 			n := env.EventuallyExpectNodeCount("==", 1)[0]
 
 			aws.ExpectCapacityReservationsCanceled(env.Context, env.EC2API, capacityReservationID)
-			canceled = true
 
 			// The NodeClaim capacity reservation controller runs once every minute, we'll give a little extra time to avoid
 			// a failure from a small delay, but the capacity type label should be updated and the reservation-id label should

diff --git a/test/suites/scheduling/suite_test.go b/test/suites/scheduling/suite_test.go
@@ -29,7 +29,6 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/sets"
 
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1"
 	"sigs.k8s.io/karpenter/pkg/test"
 
@@ -807,53 +806,6 @@ var _ = Describe("Scheduling", Ordered, ContinueOnFailure, func() {
 			Expect(reservedCount).To(Equal(1))
 			env.EventuallyExpectNodeCount("==", 2)
 		})
-		It("should demote reserved instances when the reservation is canceled", func() {
-			var canceled bool
-			capacityReservationID := environmentaws.ExpectCapacityReservationCreated(
-				env.Context,
-				env.EC2API,
-				ec2types.InstanceTypeM5Large,
-				env.ZoneInfo[0].Zone,
-				1,
-				nil,
-				nil,
-			)
-			DeferCleanup(func() {
-				if !canceled {
-					environmentaws.ExpectCapacityReservationsCanceled(env.Context, env.EC2API, capacityReservationID)
-				}
-			})
-
-			nodeClass.Spec.CapacityReservationSelectorTerms = []v1.CapacityReservationSelectorTerm{{ID: capacityReservationID}}
-			pod := test.Pod()
-			env.ExpectCreated(nodePool, nodeClass, pod)
-
-			nc := env.EventuallyExpectNodeClaimCount("==", 1)[0]
-			req, ok := lo.Find(nc.Spec.Requirements, func(req karpv1.NodeSelectorRequirementWithMinValues) bool {
-				return req.Key == v1.LabelCapacityReservationID
-			})
-			Expect(ok).To(BeTrue())
-			Expect(req.Values).To(ConsistOf(capacityReservationID))
-			n := env.EventuallyExpectNodeCount("==", 1)[0]
-
-			environmentaws.ExpectCapacityReservationsCanceled(env.Context, env.EC2API, capacityReservationID)
-			canceled = true
-
-			// The NodeClaim capacity reservation controller runs once every minute, we'll give a little extra time to avoid
-			// a failure from a small delay, but the capacity type label should be updated and the reservation-id label should
-			// be removed within a minute of the reservation being canceled.
-			Eventually(func(g Gomega) {
-				updatedNodeClaim := &karpv1.NodeClaim{}
-				g.Expect(env.Client.Get(env.Context, client.ObjectKeyFromObject(nc), updatedNodeClaim)).To(BeNil())
-				g.Expect(updatedNodeClaim.Labels).To(HaveKeyWithValue(karpv1.CapacityTypeLabelKey, karpv1.CapacityTypeOnDemand))
-				g.Expect(updatedNodeClaim.Labels).ToNot(HaveKey(v1.LabelCapacityReservationID))
-
-				updatedNode := &corev1.Node{}
-				g.Expect(env.Client.Get(env.Context, client.ObjectKeyFromObject(n), updatedNode)).To(BeNil())
-				g.Expect(updatedNodeClaim.Labels).To(HaveKeyWithValue(karpv1.CapacityTypeLabelKey, karpv1.CapacityTypeOnDemand))
-				g.Expect(updatedNodeClaim.Labels).ToNot(HaveKey(v1.LabelCapacityReservationID))
-			}).WithTimeout(75 * time.Second).Should(Succeed())
-		})
 	})
 })