Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/apis/v1/ec2nodeclass_status.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func CapacityReservationFromEC2(clk clock.Clock, cr *ec2types.CapacityReservatio
InstanceType: *cr.InstanceType,
OwnerID: *cr.OwnerId,
ReservationType: reservationType,
Interruptible: lo.Ternary(cr.Interruptible == nil, false, *cr.Interruptible),
Interruptible: lo.FromPtrOr(cr.Interruptible, false),
State: state,
}, nil
}
28 changes: 26 additions & 2 deletions pkg/controllers/nodeclass/capacityreservation_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,33 @@ var _ = Describe("NodeClass Capacity Reservation Reconciler", func() {
ReservationType: ec2types.CapacityReservationTypeDefault,
Interruptible: lo.ToPtr(true),
},
{
AvailabilityZone: lo.ToPtr("test-zone-1a"),
InstanceType: lo.ToPtr("m5.large"),
OwnerId: lo.ToPtr(selfOwnerID),
InstanceMatchCriteria: ec2types.InstanceMatchCriteriaTargeted,
CapacityReservationId: lo.ToPtr("cr-nil-interruptible"),
AvailableInstanceCount: lo.ToPtr[int32](5),
State: ec2types.CapacityReservationStateActive,
ReservationType: ec2types.CapacityReservationTypeDefault,
// Interruptible intentionally omitted (nil) — this is the default
// for standard ODCRs and capacity blocks returned by the EC2 API
Comment thread
ryan-mist marked this conversation as resolved.
},
},
})
})
It("should handle capacity reservations with nil Interruptible field", func() {
nodeClass.Spec.CapacityReservationSelectorTerms = append(nodeClass.Spec.CapacityReservationSelectorTerms, v1.CapacityReservationSelectorTerm{
ID: "cr-nil-interruptible",
})
ExpectApplied(ctx, env.Client, nodeClass)
ExpectObjectReconciled(ctx, env.Client, controller, nodeClass)
nodeClass = ExpectExists(ctx, env.Client, nodeClass)
Expect(nodeClass.StatusConditions().Get(v1.ConditionTypeCapacityReservationsReady).IsTrue()).To(BeTrue())
Expect(nodeClass.Status.CapacityReservations).To(HaveLen(1))
Expect(nodeClass.Status.CapacityReservations[0].ID).To(Equal("cr-nil-interruptible"))
Expect(nodeClass.Status.CapacityReservations[0].Interruptible).To(BeFalse())
})
It("should resolve capacity reservations by ID", func() {
const targetID = "cr-m5.large-1a-1"
nodeClass.Spec.CapacityReservationSelectorTerms = append(nodeClass.Spec.CapacityReservationSelectorTerms, v1.CapacityReservationSelectorTerm{
Expand Down Expand Up @@ -206,10 +230,10 @@ var _ = Describe("NodeClass Capacity Reservation Reconciler", func() {
ExpectObjectReconciled(ctx, env.Client, controller, nodeClass)
nodeClass = ExpectExists(ctx, env.Client, nodeClass)
Expect(nodeClass.StatusConditions().Get(v1.ConditionTypeCapacityReservationsReady).IsTrue()).To(BeTrue())
Expect(nodeClass.Status.CapacityReservations).To(HaveLen(5))
Expect(nodeClass.Status.CapacityReservations).To(HaveLen(6))
Expect(lo.Map(nodeClass.Status.CapacityReservations, func(cr v1.CapacityReservation, _ int) string {
return cr.ID
})).To(ContainElements("cr-m5.large-1a-1", "cr-m5.large-1a-2", "cr-p5.48xlarge-1a", "cr-m5.large-1b-1", "cr-m5.large-1b-2"))
})).To(ContainElements("cr-m5.large-1a-1", "cr-m5.large-1a-2", "cr-p5.48xlarge-1a", "cr-m5.large-1b-1", "cr-m5.large-1b-2", "cr-nil-interruptible"))
for _, cr := range nodeClass.Status.CapacityReservations {
Expect(cr.InstanceMatchCriteria).To(Equal("targeted"))
}
Expand Down
Loading