Merge pull request #33437 from nojnhuh/azure-autoscaler-1.31

add Azure autoscaler 1.31 job
kubernetes · Sep 6, 2024 · 5f7f284 · 5f7f284
2 parents 3612521 + 6db7729
commit 5f7f284
Showing 1 changed file with 32 additions and 16 deletions.
diff --git a/config/jobs/kubernetes/sig-autoscaling/azure/cluster-autoscaler-azure-presubmits.yaml b/config/jobs/kubernetes/sig-autoscaling/azure/cluster-autoscaler-azure-presubmits.yaml
@@ -1,10 +1,10 @@
 presubmits:
   kubernetes/autoscaler:
-  - name: pull-cluster-autoscaler-e2e-azure
+  - name: pull-cluster-autoscaler-e2e-azure-master
     cluster: eks-prow-build-cluster
     annotations:
       testgrid-dashboards: sig-autoscaling-cluster-autoscaler
-      testgrid-tab-name: cloudprovider-azure
+      testgrid-tab-name: cloudprovider-azure-master
     always_run: false
     optional: true
     run_if_changed: 'cluster-autoscaler\/cloudprovider\/azure'
@@ -16,6 +16,8 @@ presubmits:
     decoration_config:
       timeout: 5h
     path_alias: k8s.io/autoscaler
+    branches:
+      - master
     extra_refs:
     - org: kubernetes-sigs
       repo: cluster-api-provider-azure
@@ -25,25 +27,39 @@ presubmits:
     spec:
       serviceAccountName: azure
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.29
-        # This job is being phased out in favor of pull-cluster-autoscaler-e2e-azure-master. It always
-        # passes in order not to block PRs where the previous version of this job failed. This job can
-        # be removed when it is passing on all open PRs.
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
         command:
           - runner.sh
-          - "true"
+          - ./scripts/ci-entrypoint.sh
+        args:
+          - bash
+          - -c
+          - |
+            cd ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test
+            make test-e2e TAG=$(git rev-parse --short HEAD)
+        env:
+          # CAPZ config
+          - name: ADDITIONAL_ASO_CRDS
+            value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
+          - name: KUBERNETES_VERSION
+            value: "1.30" # latest available in AKS
+          - name: CLUSTER_TEMPLATE
+            value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
+        # docker-in-docker needs privileged mode
+        securityContext:
+          privileged: true
         resources:
           requests:
-            cpu: 1
-            memory: "1Gi"
+            cpu: 4
+            memory: "9Gi"
           limits:
-            cpu: 1
-            memory: "1Gi"
-  - name: pull-cluster-autoscaler-e2e-azure-master
+            cpu: 4
+            memory: "9Gi"
+  - name: pull-cluster-autoscaler-e2e-azure-1-31
     cluster: eks-prow-build-cluster
     annotations:
       testgrid-dashboards: sig-autoscaling-cluster-autoscaler
-      testgrid-tab-name: cloudprovider-azure-master
+      testgrid-tab-name: cloudprovider-azure-1.31
     always_run: false
     optional: true
     run_if_changed: 'cluster-autoscaler\/cloudprovider\/azure'
@@ -56,7 +72,7 @@ presubmits:
       timeout: 5h
     path_alias: k8s.io/autoscaler
     branches:
-      - master
+      - cluster-autoscaler-release-1.31
     extra_refs:
     - org: kubernetes-sigs
       repo: cluster-api-provider-azure
@@ -66,7 +82,7 @@ presubmits:
     spec:
       serviceAccountName: azure
       containers:
-      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-master
+      - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20240803-cf1183f2db-1.31
         command:
           - runner.sh
           - ./scripts/ci-entrypoint.sh
@@ -81,7 +97,7 @@ presubmits:
           - name: ADDITIONAL_ASO_CRDS
             value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
           - name: KUBERNETES_VERSION
-            value: "1.30" # latest available in AKS
+            value: "1.30" # 1.31 not yet available in AKS
           - name: CLUSTER_TEMPLATE
             value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
         # docker-in-docker needs privileged mode