Try fix autoscaler test

kubernetes-sigs · Oct 4, 2023 · b5d161b · b5d161b
1 parent 0d3104f
commit b5d161b
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 8 deletions.
diff --git a/config/capz/manager_image_patch.yaml b/config/capz/manager_image_patch.yaml
@@ -8,5 +8,5 @@ spec:
     spec:
       containers:
       # Change the value of image field below to your controller image URL
-      - image: localhost:5000/ci-e2e/cluster-api-azure-controller-amd64:20230926200024
+      - image: gcr.io/k8s-staging-cluster-api-azure/cluster-api-azure-controller:latest
         name: manager
diff --git a/config/capz/manager_pull_policy.yaml b/config/capz/manager_pull_policy.yaml
@@ -8,4 +8,4 @@ spec:
     spec:
       containers:
       - name: manager
-        imagePullPolicy: IfNotPresent
+        imagePullPolicy: Always
diff --git a/templates/cluster-template-aks-clusterclass-cluster.yaml b/templates/cluster-template-aks-clusterclass-cluster.yaml
diff --git a/templates/flavors/aks-clusterclass-cluster/cluster.yaml b/templates/flavors/aks-clusterclass-cluster/cluster.yaml
@@ -9,7 +9,7 @@ spec:
       cidrBlocks:
       - 192.168.0.0/16
   topology:
-    class: default
+    class: ${CLUSTER_CLASS_NAME}
     version: ${KUBERNETES_VERSION}
     workers:
       machinePools:

diff --git a/templates/test/ci/prow-aks-clusterclass/kustomization.yaml b/templates/test/ci/prow-aks-clusterclass/kustomization.yaml
@@ -8,5 +8,6 @@ patchesStrategicMerge:
   - patches/tags-aks-clusterclass.yaml
   - patches/aks-clusterclass-pool0.yaml
   - patches/aks-clusterclass-pool1.yaml
+  - patches/cluster.yaml
   - patches/addons.yaml
   - patches.yaml
diff --git a/templates/test/ci/prow-aks-clusterclass/patches/cluster.yaml b/templates/test/ci/prow-aks-clusterclass/patches/cluster.yaml
@@ -0,0 +1,7 @@
+apiVersion: cluster.x-k8s.io/v1beta1
+kind: Cluster
+metadata:
+  name: ${CLUSTER_NAME}
+spec:
+  topology:
+    class: default
diff --git a/test/e2e/aks_autoscaler.go b/test/e2e/aks_autoscaler.go
@@ -36,9 +36,10 @@ import (
 )
 
 type AKSAutoscaleSpecInput struct {
-	Cluster       *clusterv1.Cluster
-	MachinePool   *expv1.MachinePool
-	WaitIntervals []interface{}
+	Cluster        *clusterv1.Cluster
+	MachinePool    *expv1.MachinePool
+	WaitIntervals  []interface{}
+	isClusterClass bool
 }
 
 func AKSAutoscaleSpec(ctx context.Context, inputGetter func() AKSAutoscaleSpecInput) {
@@ -62,7 +63,14 @@ func AKSAutoscaleSpec(ctx context.Context, inputGetter func() AKSAutoscaleSpecIn
 	Expect(err).NotTo(HaveOccurred())
 
 	ammp := &infrav1.AzureManagedMachinePool{}
-	err = mgmtClient.Get(ctx, client.ObjectKeyFromObject(input.MachinePool), ammp)
+	if input.isClusterClass {
+		err = bootstrapClusterProxy.GetClient().Get(ctx, types.NamespacedName{
+			Namespace: input.MachinePool.Spec.Template.Spec.InfrastructureRef.Namespace,
+			Name:      input.MachinePool.Spec.Template.Spec.InfrastructureRef.Name,
+		}, ammp)
+	} else {
+		err = mgmtClient.Get(ctx, client.ObjectKeyFromObject(input.MachinePool), ammp)
+	}
 	Expect(err).NotTo(HaveOccurred())
 
 	resourceGroupName := amcp.Spec.ResourceGroupName