Skip to content

Commit e4b4ee5

Browse files
authored
Merge pull request #35827 from jackfrancis/ca-capz-aks-lts-tests
autoscaling: use AKS LTS for Azure CA tests
2 parents 4ae6f07 + c0ce00a commit e4b4ee5

File tree

1 file changed

+28
-55
lines changed

1 file changed

+28
-55
lines changed

config/jobs/kubernetes/sig-autoscaling/azure/cluster-autoscaler-azure-presubmits.yaml

Lines changed: 28 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ presubmits:
102102
value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
103103
- name: KUBERNETES_VERSION
104104
value: "1.32"
105+
- name: AKS_TIER
106+
value: "Premium" # required for LTS
107+
- name: AKS_SUPPORT_PLAN
108+
value: "AKSLongTermSupport" # Use LTS
105109
- name: CLUSTER_TEMPLATE
106110
value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
107111
# docker-in-docker needs privileged mode
@@ -157,6 +161,10 @@ presubmits:
157161
value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
158162
- name: KUBERNETES_VERSION
159163
value: "1.33" # TODO update when 1.34 is available in AKS
164+
- name: AKS_TIER
165+
value: "Premium" # required for LTS
166+
- name: AKS_SUPPORT_PLAN
167+
value: "AKSLongTermSupport" # Use LTS
160168
- name: CLUSTER_TEMPLATE
161169
value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
162170
# docker-in-docker needs privileged mode
@@ -212,6 +220,10 @@ presubmits:
212220
value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
213221
- name: KUBERNETES_VERSION
214222
value: "1.33"
223+
- name: AKS_TIER
224+
value: "Premium" # required for LTS
225+
- name: AKS_SUPPORT_PLAN
226+
value: "AKSLongTermSupport" # Use LTS
215227
- name: CLUSTER_TEMPLATE
216228
value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
217229
# docker-in-docker needs privileged mode
@@ -267,6 +279,10 @@ presubmits:
267279
value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
268280
- name: KUBERNETES_VERSION
269281
value: "1.31"
282+
- name: AKS_TIER
283+
value: "Premium" # required for LTS
284+
- name: AKS_SUPPORT_PLAN
285+
value: "AKSLongTermSupport" # Use LTS
270286
- name: CLUSTER_TEMPLATE
271287
value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
272288
# docker-in-docker needs privileged mode
@@ -322,6 +338,10 @@ presubmits:
322338
value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
323339
- name: KUBERNETES_VERSION
324340
value: "1.30"
341+
- name: AKS_TIER
342+
value: "Premium" # required for LTS
343+
- name: AKS_SUPPORT_PLAN
344+
value: "AKSLongTermSupport" # Use LTS
325345
- name: CLUSTER_TEMPLATE
326346
value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
327347
# docker-in-docker needs privileged mode
@@ -377,6 +397,10 @@ presubmits:
377397
value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
378398
- name: KUBERNETES_VERSION
379399
value: "1.29"
400+
- name: AKS_TIER
401+
value: "Premium" # required for LTS
402+
- name: AKS_SUPPORT_PLAN
403+
value: "AKSLongTermSupport" # Use LTS
380404
- name: CLUSTER_TEMPLATE
381405
value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
382406
# docker-in-docker needs privileged mode
@@ -432,61 +456,10 @@ presubmits:
432456
value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
433457
- name: KUBERNETES_VERSION
434458
value: "1.28"
435-
- name: CLUSTER_TEMPLATE
436-
value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
437-
# docker-in-docker needs privileged mode
438-
securityContext:
439-
privileged: true
440-
resources:
441-
requests:
442-
cpu: 4
443-
memory: "9Gi"
444-
limits:
445-
cpu: 4
446-
memory: "9Gi"
447-
- name: pull-cluster-autoscaler-e2e-azure-1-27
448-
cluster: eks-prow-build-cluster
449-
annotations:
450-
testgrid-dashboards: sig-autoscaling-cluster-autoscaler
451-
testgrid-tab-name: cloudprovider-azure-1.27
452-
always_run: false
453-
optional: true
454-
run_if_changed: 'cluster-autoscaler\/cloudprovider\/azure'
455-
labels:
456-
preset-dind-enabled: "true"
457-
preset-kind-volume-mounts: "true"
458-
preset-azure-community: "true"
459-
decorate: true
460-
decoration_config:
461-
timeout: 5h
462-
path_alias: k8s.io/autoscaler
463-
branches:
464-
- cluster-autoscaler-release-1.27
465-
extra_refs:
466-
- org: kubernetes-sigs
467-
repo: cluster-api-provider-azure
468-
base_ref: release-1.18
469-
path_alias: sigs.k8s.io/cluster-api-provider-azure
470-
workdir: true
471-
spec:
472-
serviceAccountName: azure
473-
containers:
474-
- image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241021-1164926229-1.27
475-
command:
476-
- runner.sh
477-
- ./scripts/ci-entrypoint.sh
478-
args:
479-
- bash
480-
- -c
481-
- |
482-
cd ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test
483-
make test-e2e TAG=$(git rev-parse --short HEAD)
484-
env:
485-
# CAPZ config
486-
- name: ADDITIONAL_ASO_CRDS
487-
value: authorization.azure.com/*;managedidentity.azure.com/* # needed for this CLUSTER_TEMPLATE
488-
- name: KUBERNETES_VERSION
489-
value: "1.27"
459+
- name: AKS_TIER
460+
value: "Premium" # required for LTS
461+
- name: AKS_SUPPORT_PLAN
462+
value: "AKSLongTermSupport" # Use LTS
490463
- name: CLUSTER_TEMPLATE
491464
value: ${GOPATH}/src/k8s.io/autoscaler/cluster-autoscaler/cloudprovider/azure/test/templates/cluster-template-prow-aks-aso-cluster-autoscaler.yaml
492465
# docker-in-docker needs privileged mode

0 commit comments

Comments
 (0)