Review feedback

Author: DerekFrank

pkg/providers/instance/instance.go

@@ -445,6 +445,13 @@ func (p *DefaultProvider) updateUnavailableOfferingsCache(
 	nodeClaim *karpv1.NodeClaim,
 	instanceTypes []*cloudprovider.InstanceType,
 ) {
+	for _, err := range errs {
+		zone := lo.FromPtr(err.LaunchTemplateAndOverrides.Overrides.AvailabilityZone)
+		if awserrors.IsInsufficientFreeAddressesInSubnet(err) && zone != "" {
+			p.unavailableOfferings.MarkAZUnavailable(zone)
+		}
+	}
+
 	if capacityType != karpv1.CapacityTypeReserved {
 		for _, err := range errs {
 			if awserrors.IsUnfulfillableCapacity(err) {
@@ -454,9 +461,6 @@ func (p *DefaultProvider) updateUnavailableOfferingsCache(
 				p.unavailableOfferings.MarkCapacityTypeUnavailable(karpv1.CapacityTypeSpot)
 				p.recorder.Publish(SpotServiceLinkedRoleCreationFailure(nodeClaim))
 			}
-			if awserrors.IsInsufficientFreeAddressesInSubnet(err) {
-				p.unavailableOfferings.MarkAZUnavailable(*err.LaunchTemplateAndOverrides.Overrides.AvailabilityZone)
-			}
 		}
 		return
 	}

pkg/providers/instance/suite_test.go

@@ -376,7 +376,16 @@ var _ = Describe("InstanceProvider", func() {
 		Expect(corecloudprovider.IsInsufficientCapacityError(err)).To(BeTrue())
 		Expect(instance).To(BeNil())
 
-		// We should have set the subnet used in the request as unavailable
-		Expect(awsEnv.UnavailableOfferingsCache.IsUnavailable("m5.xlarge", "test-zone-1a", "on-demand")).To(BeTrue())
+		// We should have set the zone used in the request as unavailable for all instance types
+		for _, instance := range instanceTypes {
+			Expect(awsEnv.UnavailableOfferingsCache.IsUnavailable(ec2types.InstanceType(instance.Name), "test-zone-1a", "on-demand")).To(BeTrue())
+		}
+		// But we should not have set the other zones as unavailable
+		zones := []string{"test-zone-1b", "test-zone-1c"}
+		for _, zone := range zones {
+			for _, instance := range instanceTypes {
+				Expect(awsEnv.UnavailableOfferingsCache.IsUnavailable(ec2types.InstanceType(instance.Name), zone, "on-demand")).To(BeFalse())
+			}
+		}
 	})
 })