Bump cluster-autoscaler to v1.33, pin apiVersion to v1beta1

Signed-off-by: Stefan Büringer [email protected]

Author: sbueringer

hack/e2e.sh

@@ -121,7 +121,6 @@ export E2E_CONF_FILE="${REPO_ROOT}/test/e2e/config/vsphere.yaml"
 export E2E_CONF_OVERRIDE_FILE=""
 export E2E_VM_OPERATOR_VERSION="${VM_OPERATOR_VERSION:-v1.8.6-0-gde75746a}"
 export DOCKER_IMAGE_TAR="/tmp/images/image.tar"
-export GC_KIND="false"
 
 SSH_KEY_DIR=$(mktemp -d)
 export VSPHERE_SSH_PRIVATE_KEY

test/e2e/autoscaler_test.go

@@ -43,7 +43,7 @@ var _ = Describe("When using the autoscaler with Cluster API using ClusterClass
 				},
 				InfrastructureAPIGroup:            "vmware.infrastructure.cluster.x-k8s.io",
 				InfrastructureMachineTemplateKind: "vspheremachinetemplates",
-				AutoscalerVersion:                 "v1.31.0",
+				AutoscalerVersion:                 "v1.33.0",
 				ScaleToAndFromZero:                true,
 				// We have no connectivity from the workload cluster to the kind management cluster in CI so we
 				// can't deploy the autoscaler to the workload cluster.

test/e2e/data/autoscaler/autoscaler-to-management-workload.yaml

@@ -70,6 +70,12 @@ spec:
             # Note: The E2E test should only go up to 4 (assuming it starts with a min node group size of 2).
             # Using 6 for additional some buffer and to allow different starting min node group sizes.
             - --max-nodes-total=6
+          env:
+            # Per default autoscaler uses the preferred apiVersion to retrieve MachineDeployments.
+            # If that apiVersion is v1beta2 the current autoscaler implementation is not able
+            # to resolve infrastructureRefs as the ref format changed. This would break scale from zero.
+            - name: CAPI_VERSION
+              value: v1beta1
           volumeMounts:
             - name: kubeconfig-management-cluster
               mountPath: /management-cluster