fix: resolve stale test references from rebase onto main

Remove tests and assertions that were invalidated by recently merged PRs
but survived the rebase because the conflict resolution didn't catch them:

- Remove 7 stale GC tests referencing creationtimestamp tag deleted by
  #1468 (MachineStatus migration). These tests called the non-existent
  instance.AKSMachineTimestampToTag function, causing compile failure.
- Remove duplicate E2E tests from instancetype/suite_test.go (Zone-aware,
  CloudProvider Create Error Cases, Unavailable Offerings) that are
  already covered by shared tests in cloudprovider/suite_offerings_test.go.
  These duplicates referenced the removed nodePool variable.
- Add missing Azure test/expectations dot-import to suite_test.go for
  ExpectProvisionedAndWaitForPromises (used by test added in #1538).
- Remove stale creationtimestamp tag assertion from suite_features_test.go
  (tag removed by #1468).
- Restore ScaleSetPrioritySpot assertion from #1546 (allocationstrategy
  provider) by adding priority field to creationResult struct, preserving
  the test's intention in the reunified framework.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: comtalyst

pkg/cloudprovider/suite_features_test.go

@@ -301,7 +301,6 @@ func runCommonAdditionalTagsTests() {
 				Expect(*nic.Interface.Tags["karpenter.sh_nodepool"]).To(Equal(nodePool.Name))
 			} else {
 				Expect(result.tags).To(HaveKey("karpenter.azure.com_aksmachine_nodeclaim"))
-				Expect(result.tags).To(HaveKey("karpenter.azure.com_aksmachine_creationtimestamp"))
 			}
 		})
 	})

pkg/cloudprovider/suite_offerings_test.go

@@ -34,6 +34,7 @@ import (
 	. "sigs.k8s.io/karpenter/pkg/test/expectations"
 
 	"github.com/Azure/azure-sdk-for-go/profiles/latest/compute/mgmt/compute"
+	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v8"
 	"github.com/Azure/karpenter-provider-azure/pkg/controllers/nodeclass/status"
 	"github.com/Azure/karpenter-provider-azure/pkg/fake"
 	. "github.com/Azure/karpenter-provider-azure/pkg/test/expectations"
@@ -65,6 +66,11 @@ var _ = Describe("CloudProvider - Offerings", func() {
 
 				Expect(getCreateCallCount()).To(BeNumerically(">=", 1))
 				result := popCreationResult()
+				// Verify the failed creation was for a Spot instance (AKS Machine mode exposes priority)
+				if isAKSMachineMode() {
+					Expect(result.priority).ToNot(BeNil())
+					Expect(*result.priority).To(Equal(armcontainerservice.ScaleSetPrioritySpot))
+				}
 				testSKU := &skewer.SKU{Name: lo.ToPtr(result.vmSize)}
 				Expect(result.zoneErr).ToNot(HaveOccurred())
 				ExpectUnavailable(azureEnv, testSKU, result.zone, karpv1.CapacityTypeSpot)

pkg/cloudprovider/suite_shared_provision_test.go

@@ -69,6 +69,7 @@ type creationResult struct {
 	diskSizeGB  *int32
 	imageRef    string
 	osDiskType  string // AKS Machine: OSDiskType value ("Managed"/"Ephemeral"); VM: empty (use isEphemeral/diffDiskOption instead)
+	priority    *armcontainerservice.ScaleSetPriority // AKS Machine only: the priority (Spot/Regular) of the creation request
 	// VM-specific fields (populated only for AKSScriptless/BootstrappingClient mode)
 	customData              string // decoded base64 custom data from OSProfile
 	diffDiskOption          string // DiffDiskSettings.Option value (e.g. "Local")
@@ -323,6 +324,7 @@ func popAKSMachineCreationResult() creationResult {
 		diskSizeGB:  diskSizeGB,
 		osDiskType:  osDiskType,
 		imageRef:    lo.FromPtr(m.Properties.NodeImageVersion),
+		priority:    m.Properties.Priority,
 	}
 }
 

pkg/cloudprovider/suite_test.go

@@ -48,6 +48,7 @@ import (
 	"github.com/Azure/karpenter-provider-azure/pkg/operator/options"
 	"github.com/Azure/karpenter-provider-azure/pkg/providers/instance"
 	"github.com/Azure/karpenter-provider-azure/pkg/test"
+	. "github.com/Azure/karpenter-provider-azure/pkg/test/expectations"
 	"github.com/Azure/karpenter-provider-azure/pkg/utils"
 	"github.com/Azure/skewer"
 

pkg/controllers/nodeclaim/garbagecollection/suite_aksmachine_test.go

@@ -20,10 +20,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/awslabs/operatorpkg/object"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v7"
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/containerservice/armcontainerservice/v8"
-	"github.com/Azure/karpenter-provider-azure/pkg/apis/v1beta1"
 	"github.com/Azure/karpenter-provider-azure/pkg/operator/options"
 	"github.com/Azure/karpenter-provider-azure/pkg/providers/instance"
 	"github.com/Azure/karpenter-provider-azure/pkg/providers/launchtemplate"
@@ -34,7 +32,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/samber/lo"
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	karpv1 "sigs.k8s.io/karpenter/pkg/apis/v1"
 	corecloudprovider "sigs.k8s.io/karpenter/pkg/cloudprovider"
 	coretest "sigs.k8s.io/karpenter/pkg/test"
@@ -220,264 +217,6 @@ var _ = Describe("Instance Garbage Collection", func() {
 			ExpectNotFound(ctx, env.Client, node)
 		})
 
-		// AKS-specific: malformed/missing timestamp tests
-		It("should delete an AKS machine if there is no NodeClaim owner, and with malformed timestamp tag", func() {
-			aksMachine.Properties.Tags["karpenter.azure.com_aksmachine_creationtimestamp"] = lo.ToPtr("malformed-timestamp")
-			azureEnv.AKSDataStorage.AKSMachines.Store(lo.FromPtr(aksMachine.ID), *aksMachine)
-
-			ExpectSingletonReconciled(ctx, InstanceGCController)
-
-			_, err = cloudProvider.Get(ctx, providerID)
-			Expect(err).To(HaveOccurred())
-			Expect(corecloudprovider.IsNodeClaimNotFoundError(err)).To(BeTrue())
-		})
-
-		It("should delete an AKS machine if there is no NodeClaim owner, and without timestamp tag", func() {
-			delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_creationtimestamp")
-			azureEnv.AKSDataStorage.AKSMachines.Store(lo.FromPtr(aksMachine.ID), *aksMachine)
-
-			ExpectSingletonReconciled(ctx, InstanceGCController)
-
-			_, err = cloudProvider.Get(ctx, providerID)
-			Expect(err).To(HaveOccurred())
-			Expect(corecloudprovider.IsNodeClaimNotFoundError(err)).To(BeTrue())
-		})
-
-		var _ = Context("Complex tags manipulation scenarios with in-place updates", func() {
-			var nodeClaim *karpv1.NodeClaim
-			var nodeClass *v1beta1.AKSNodeClass
-
-			BeforeEach(func() {
-				// Set up agent pool for AKS machines
-				opts := options.FromContext(ctx)
-				agentPool := test.AKSAgentPool(test.AKSAgentPoolOptions{
-					Name:          opts.AKSMachinesPoolName,
-					ResourceGroup: opts.NodeResourceGroup,
-					ClusterName:   opts.ClusterName,
-				})
-				azureEnv.AKSDataStorage.AgentPools.Store(lo.FromPtr(agentPool.ID), *agentPool)
-
-				// Create AKS machine
-				aksMachine = test.AKSMachine(test.AKSMachineOptions{Name: "corner-case-machine", MachinesPoolName: opts.AKSMachinesPoolName})
-				providerID = utils.VMResourceIDToProviderID(ctx, lo.FromPtr(aksMachine.Properties.ResourceID))
-
-				// Create corresponding NodeClaim, not launched yet
-				nodeClass = test.AKSNodeClass()
-				nodeClaim = coretest.NodeClaim(karpv1.NodeClaim{
-					ObjectMeta: metav1.ObjectMeta{
-						Name: "corner-case-nodeclaim",
-						Annotations: map[string]string{
-							v1beta1.AnnotationAKSMachineResourceID: lo.FromPtr(aksMachine.ID),
-						},
-					},
-					Spec: karpv1.NodeClaimSpec{
-						NodeClassRef: &karpv1.NodeClassReference{
-							Group: object.GVK(nodeClass).Group,
-							Kind:  object.GVK(nodeClass).Kind,
-							Name:  nodeClass.Name,
-						},
-					},
-				})
-			})
-
-			AfterEach(func() {
-				ExpectCleanedUp(ctx, env.Client)
-			})
-
-			It("Instance created -> Tag deleted -> In-place update -> Garbage collection false positive -> Create() completed -> Registered -> In-place update", func() {
-				// Blank NodeClaim is there from the core.
-				ExpectApplied(ctx, env.Client, nodeClaim, nodeClass)
-
-				// AKS machine created, but the user somehow deleted the timestamp tag
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_creationtimestamp")
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_nodeclaim")
-				azureEnv.AKSDataStorage.AKSMachines.Store(lo.FromPtr(aksMachine.ID), *aksMachine)
-
-				// Provider still waiting for Create() to complete. No change to NodeClaim.
-
-				// In-place update reconciles - should not do anything as no ProviderID yet
-				ExpectObjectReconciled(ctx, env.Client, inPlaceUpdateController, nodeClaim)
-				// Verify no update calls and the timestamp tag stays broken.
-				Expect(azureEnv.AKSMachinesAPI.AKSMachineCreateOrUpdateBehavior.CalledWithInput.Len()).To(Equal(0))
-				unchangedAKSMachine, err := azureEnv.AKSMachineProvider.Get(ctx, *aksMachine.Name)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(unchangedAKSMachine.Properties.Tags).ToNot(HaveKey("karpenter.azure.com_aksmachine_creationtimestamp"))
-				Expect(unchangedAKSMachine.Properties.Tags).ToNot(HaveKey("karpenter.azure.com_aksmachine_nodeclaim"))
-
-				// Garbage collection reconciles - should garbage collect due to no NodeClaim owner + timestamp defaulting to epoch
-				// This is expected, but not what we really wanted... See suggestions in respective modules.
-				ExpectSingletonReconciled(ctx, InstanceGCController)
-				_, err = cloudProvider.Get(ctx, providerID)
-				Expect(err).To(HaveOccurred())
-				Expect(corecloudprovider.IsNodeClaimNotFoundError(err)).To(BeTrue())
-
-				// Provider Create() completes, setting the ProviderID on the NodeClaim
-				// Assume this comes at unfortunate time and just went in effect...
-				nodeClaim.Status.ProviderID = providerID
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeLaunched)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// NodeClaim gets registered
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeRegistered)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// In-place update reconciles again - should error NodeClaim not found, as instance is gone
-				_, err = inPlaceUpdateController.Reconcile(ctx, nodeClaim)
-				Expect(err).To(HaveOccurred())
-				Expect(corecloudprovider.IsNodeClaimNotFoundError(err)).To(BeTrue())
-				// Verify no additional update calls and no instance
-				Expect(azureEnv.AKSMachinesAPI.AKSMachineCreateOrUpdateBehavior.CalledWithInput.Len()).To(Equal(0))
-				_, err = azureEnv.AKSMachineProvider.Get(ctx, *aksMachine.Name)
-				Expect(err).To(HaveOccurred()) // Still gone
-				Expect(corecloudprovider.IsNodeClaimNotFoundError(err)).To(BeTrue())
-
-				// Core will eventually clean up the orphaned NodeClaim
-			})
-
-			It("Instance created -> Tag deleted -> Create() completed -> Registered -> In-place update -> Garbage collection negative -> In-place update -> Garbage collection negative -> Tag deleted -> Garbage collection negative", func() {
-				// Blank NodeClaim is there from the core.
-				ExpectApplied(ctx, env.Client, nodeClaim, nodeClass)
-
-				// AKS machine created, but the user somehow deleted the timestamp tag
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_creationtimestamp")
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_nodeclaim")
-				azureEnv.AKSDataStorage.AKSMachines.Store(lo.FromPtr(aksMachine.ID), *aksMachine)
-
-				// Provider Create() completes, setting the ProviderID on the NodeClaim
-				nodeClaim.Status.ProviderID = providerID
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeLaunched)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// NodeClaim gets registered
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeRegistered)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// In-place update reconciles - should repair timestamp tag to epoch
-				ExpectObjectReconciled(ctx, env.Client, inPlaceUpdateController, nodeClaim)
-				// Verify update call and the timestamp tag is repaired to epoch.
-				Expect(azureEnv.AKSMachinesAPI.AKSMachineCreateOrUpdateBehavior.CalledWithInput.Len()).To(Equal(1))
-				updatedAKSMachine, err := azureEnv.AKSMachineProvider.Get(ctx, *aksMachine.Name)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(updatedAKSMachine.Properties.Tags).To(HaveKey("karpenter.azure.com_aksmachine_creationtimestamp"))
-				Expect(*updatedAKSMachine.Properties.Tags["karpenter.azure.com_aksmachine_creationtimestamp"]).To(Equal(instance.AKSMachineTimestampToTag(instance.ZeroAKSMachineTimestamp())))
-				Expect(updatedAKSMachine.Properties.Tags).To(HaveKey("karpenter.azure.com_aksmachine_nodeclaim"))
-				Expect(*updatedAKSMachine.Properties.Tags["karpenter.azure.com_aksmachine_nodeclaim"]).To(Equal("corner-case-nodeclaim"))
-
-				// Garbage collection reconciles - should not garbage collect due to NodeClaim owner
-				ExpectSingletonReconciled(ctx, InstanceGCController)
-				_, err = cloudProvider.Get(ctx, providerID)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(azureEnv.AKSAgentPoolsAPI.AgentPoolDeleteMachinesBehavior.CalledWithInput.Len()).To(Equal(0))
-
-				// In-place update reconciles again - should preserve existing timestamp tag
-				ExpectObjectReconciled(ctx, env.Client, inPlaceUpdateController, nodeClaim)
-				// Verify no additional update calls and the timestamp tag stays unchanged.
-				Expect(azureEnv.AKSMachinesAPI.AKSMachineCreateOrUpdateBehavior.CalledWithInput.Len()).To(Equal(1))
-				unchangedAKSMachine, err := azureEnv.AKSMachineProvider.Get(ctx, *aksMachine.Name)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(unchangedAKSMachine.Properties.Tags).To(HaveKey("karpenter.azure.com_aksmachine_creationtimestamp"))
-				Expect(*unchangedAKSMachine.Properties.Tags["karpenter.azure.com_aksmachine_creationtimestamp"]).To(Equal(instance.AKSMachineTimestampToTag(instance.ZeroAKSMachineTimestamp())))
-				Expect(unchangedAKSMachine.Properties.Tags).To(HaveKey("karpenter.azure.com_aksmachine_nodeclaim"))
-				Expect(*unchangedAKSMachine.Properties.Tags["karpenter.azure.com_aksmachine_nodeclaim"]).To(Equal("corner-case-nodeclaim"))
-
-				// Garbage collection reconciles - should not garbage collect due to NodeClaim owner
-				ExpectSingletonReconciled(ctx, InstanceGCController)
-				_, err = cloudProvider.Get(ctx, providerID)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(azureEnv.AKSAgentPoolsAPI.AgentPoolDeleteMachinesBehavior.CalledWithInput.Len()).To(Equal(0))
-
-				// The user somehow deleted the timestamp tag again
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_creationtimestamp")
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_nodeclaim")
-				azureEnv.AKSDataStorage.AKSMachines.Store(lo.FromPtr(aksMachine.ID), *aksMachine)
-
-				// Garbage collection reconciles - should not garbage collect due to NodeClaim owner
-				ExpectSingletonReconciled(ctx, InstanceGCController)
-				_, err = cloudProvider.Get(ctx, providerID)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(azureEnv.AKSAgentPoolsAPI.AgentPoolDeleteMachinesBehavior.CalledWithInput.Len()).To(Equal(0))
-			})
-
-			It("Instance created -> Tag deleted -> In-place update -> Create() completed -> Registered -> Garbage collection negative", func() {
-				// Blank NodeClaim is there from the core.
-				ExpectApplied(ctx, env.Client, nodeClaim, nodeClass)
-
-				// AKS machine created, but the user somehow deleted the timestamp tag
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_creationtimestamp")
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_nodeclaim")
-				azureEnv.AKSDataStorage.AKSMachines.Store(lo.FromPtr(aksMachine.ID), *aksMachine)
-
-				// In-place update reconciles - should not do anything as no ProviderID yet
-				ExpectObjectReconciled(ctx, env.Client, inPlaceUpdateController, nodeClaim)
-				// Verify no update calls and the timestamp tag stays broken.
-				Expect(azureEnv.AKSMachinesAPI.AKSMachineCreateOrUpdateBehavior.CalledWithInput.Len()).To(Equal(0))
-				unchangedAKSMachine, err := azureEnv.AKSMachineProvider.Get(ctx, *aksMachine.Name)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(unchangedAKSMachine.Properties.Tags).ToNot(HaveKey("karpenter.azure.com_aksmachine_creationtimestamp"))
-				Expect(unchangedAKSMachine.Properties.Tags).ToNot(HaveKey("karpenter.azure.com_aksmachine_nodeclaim"))
-
-				// Provider Create() completes, setting the ProviderID on the NodeClaim
-				nodeClaim.Status.ProviderID = providerID
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeLaunched)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// NodeClaim gets registered
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeRegistered)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// Garbage collection reconciles - should not garbage collect due to NodeClaim owner
-				ExpectSingletonReconciled(ctx, InstanceGCController)
-				_, err = cloudProvider.Get(ctx, providerID)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(azureEnv.AKSAgentPoolsAPI.AgentPoolDeleteMachinesBehavior.CalledWithInput.Len()).To(Equal(0))
-			})
-
-			It("Instance created -> Tag deleted -> Create() completed -> Garbage collection negative", func() {
-				// Blank NodeClaim is there from the core.
-				ExpectApplied(ctx, env.Client, nodeClaim, nodeClass)
-
-				// AKS machine created, but the user somehow deleted the timestamp tag
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_creationtimestamp")
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_nodeclaim")
-				azureEnv.AKSDataStorage.AKSMachines.Store(lo.FromPtr(aksMachine.ID), *aksMachine)
-
-				// Provider Create() completes, setting the ProviderID on the NodeClaim
-				nodeClaim.Status.ProviderID = providerID
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeLaunched)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// Garbage collection reconciles - should not garbage collect due to NodeClaim owner
-				ExpectSingletonReconciled(ctx, InstanceGCController)
-				_, err = cloudProvider.Get(ctx, providerID)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(azureEnv.AKSAgentPoolsAPI.AgentPoolDeleteMachinesBehavior.CalledWithInput.Len()).To(Equal(0))
-			})
-
-			It("Instance created -> Tag deleted -> Create() completed -> Registered -> Garbage collection negative", func() {
-				// Blank NodeClaim is there from the core.
-				ExpectApplied(ctx, env.Client, nodeClaim, nodeClass)
-
-				// AKS machine created, but the user somehow deleted the timestamp tag
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_creationtimestamp")
-				delete(aksMachine.Properties.Tags, "karpenter.azure.com_aksmachine_nodeclaim")
-				azureEnv.AKSDataStorage.AKSMachines.Store(lo.FromPtr(aksMachine.ID), *aksMachine)
-
-				// Provider Create() completes, setting the ProviderID on the NodeClaim
-				nodeClaim.Status.ProviderID = providerID
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeLaunched)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// NodeClaim gets registered
-				nodeClaim.StatusConditions().SetTrue(karpv1.ConditionTypeRegistered)
-				ExpectApplied(ctx, env.Client, nodeClaim)
-
-				// Garbage collection reconciles - should not garbage collect due to NodeClaim owner
-				ExpectSingletonReconciled(ctx, InstanceGCController)
-				_, err = cloudProvider.Get(ctx, providerID)
-				Expect(err).ToNot(HaveOccurred())
-				Expect(azureEnv.AKSAgentPoolsAPI.AgentPoolDeleteMachinesBehavior.CalledWithInput.Len()).To(Equal(0))
-			})
-		})
 	})
 
 	var _ = Context("Mixed VM and AKS machine instances", func() {