Refactor AKS machine pool spec to target a specific management cluster

Author: nojnhuh

test/e2e/aks_machinepools.go

@@ -39,6 +39,7 @@ import (
 )
 
 type AKSMachinePoolSpecInput struct {
+	MgmtCluster   framework.ClusterProxy
 	Cluster       *clusterv1.Cluster
 	MachinePools  []*expv1.MachinePool
 	WaitIntervals []interface{}
@@ -58,7 +59,7 @@ func AKSMachinePoolSpec(ctx context.Context, inputGetter func() AKSMachinePoolSp
 
 			Byf("Scaling machine pool %s out", mp.Name)
 			framework.ScaleMachinePoolAndWait(ctx, framework.ScaleMachinePoolAndWaitInput{
-				ClusterProxy:              bootstrapClusterProxy,
+				ClusterProxy:              input.MgmtCluster,
 				Cluster:                   input.Cluster,
 				Replicas:                  ptr.Deref(mp.Spec.Replicas, 0) + 1,
 				MachinePools:              []*expv1.MachinePool{mp},
@@ -67,7 +68,7 @@ func AKSMachinePoolSpec(ctx context.Context, inputGetter func() AKSMachinePoolSp
 
 			Byf("Scaling machine pool %s in", mp.Name)
 			framework.ScaleMachinePoolAndWait(ctx, framework.ScaleMachinePoolAndWaitInput{
-				ClusterProxy:              bootstrapClusterProxy,
+				ClusterProxy:              input.MgmtCluster,
 				Cluster:                   input.Cluster,
 				Replicas:                  ptr.Deref(mp.Spec.Replicas, 0) - 1,
 				MachinePools:              []*expv1.MachinePool{mp},
@@ -79,7 +80,7 @@ func AKSMachinePoolSpec(ctx context.Context, inputGetter func() AKSMachinePoolSp
 			switch mp.Spec.Template.Spec.InfrastructureRef.Kind {
 			case infrav1.AzureManagedMachinePoolKind:
 				ammp := &infrav1.AzureManagedMachinePool{}
-				err := bootstrapClusterProxy.GetClient().Get(ctx, types.NamespacedName{
+				err := input.MgmtCluster.GetClient().Get(ctx, types.NamespacedName{
 					Namespace: mp.Spec.Template.Spec.InfrastructureRef.Namespace,
 					Name:      mp.Spec.Template.Spec.InfrastructureRef.Name,
 				}, ammp)
@@ -90,7 +91,7 @@ func AKSMachinePoolSpec(ctx context.Context, inputGetter func() AKSMachinePoolSp
 				}
 			case infrav1alpha.AzureASOManagedMachinePoolKind:
 				ammp := &infrav1alpha.AzureASOManagedMachinePool{}
-				err := bootstrapClusterProxy.GetClient().Get(ctx, types.NamespacedName{
+				err := input.MgmtCluster.GetClient().Get(ctx, types.NamespacedName{
 					Namespace: mp.Spec.Template.Spec.InfrastructureRef.Namespace,
 					Name:      mp.Spec.Template.Spec.InfrastructureRef.Name,
 				}, ammp)
@@ -105,7 +106,7 @@ func AKSMachinePoolSpec(ctx context.Context, inputGetter func() AKSMachinePoolSp
 					// mode may not be set in spec. Get the ASO object and check in status.
 					resource.SetNamespace(ammp.Namespace)
 					agentPool := &asocontainerservicev1.ManagedClustersAgentPool{}
-					Expect(bootstrapClusterProxy.GetClient().Get(ctx, client.ObjectKeyFromObject(resource), agentPool)).To(Succeed())
+					Expect(input.MgmtCluster.GetClient().Get(ctx, client.ObjectKeyFromObject(resource), agentPool)).To(Succeed())
 					if ptr.Deref(agentPool.Status.Mode, "") != asocontainerservicev1.AgentPoolMode_STATUS_System {
 						isUserPool = true
 					}
@@ -116,7 +117,7 @@ func AKSMachinePoolSpec(ctx context.Context, inputGetter func() AKSMachinePoolSp
 			if isUserPool {
 				Byf("Scaling the machine pool %s to zero", mp.Name)
 				framework.ScaleMachinePoolAndWait(ctx, framework.ScaleMachinePoolAndWaitInput{
-					ClusterProxy:              bootstrapClusterProxy,
+					ClusterProxy:              input.MgmtCluster,
 					Cluster:                   input.Cluster,
 					Replicas:                  0,
 					MachinePools:              []*expv1.MachinePool{mp},
@@ -126,7 +127,7 @@ func AKSMachinePoolSpec(ctx context.Context, inputGetter func() AKSMachinePoolSp
 
 			Byf("Restoring initial replica count for machine pool %s", mp.Name)
 			framework.ScaleMachinePoolAndWait(ctx, framework.ScaleMachinePoolAndWaitInput{
-				ClusterProxy:              bootstrapClusterProxy,
+				ClusterProxy:              input.MgmtCluster,
 				Cluster:                   input.Cluster,
 				Replicas:                  originalReplicas,
 				MachinePools:              []*expv1.MachinePool{mp},

test/e2e/azure_test.go

@@ -821,6 +821,7 @@ var _ = Describe("Workload cluster creation", func() {
 			By("Exercising machine pools", func() {
 				AKSMachinePoolSpec(ctx, func() AKSMachinePoolSpecInput {
 					return AKSMachinePoolSpecInput{
+						MgmtCluster:   bootstrapClusterProxy,
 						Cluster:       result.Cluster,
 						MachinePools:  result.MachinePools,
 						WaitIntervals: e2eConfig.GetIntervals(specName, "wait-machine-pool-nodes"),
@@ -982,6 +983,7 @@ var _ = Describe("Workload cluster creation", func() {
 			By("Exercising machine pools", func() {
 				AKSMachinePoolSpec(ctx, func() AKSMachinePoolSpecInput {
 					return AKSMachinePoolSpecInput{
+						MgmtCluster:   bootstrapClusterProxy,
 						Cluster:       result.Cluster,
 						MachinePools:  result.MachinePools,
 						WaitIntervals: e2eConfig.GetIntervals(specName, "wait-machine-pool-nodes"),