From 674b4794037792bd2b43040befd72e82b99c2db1 Mon Sep 17 00:00:00 2001 From: Ole Markus With Date: Thu, 12 May 2022 20:36:55 +0200 Subject: [PATCH] Bump cluster autoscaler image for 1.24 --- pkg/model/components/clusterautoscaler.go | 4 +++- .../data/aws_s3_object_cluster-completed.spec_content | 2 +- ...aws_s3_object_minimal.example.com-addons-bootstrap_content | 2 +- ...m-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/pkg/model/components/clusterautoscaler.go b/pkg/model/components/clusterautoscaler.go index 5fe0b22edc..8aaa56fe5a 100644 --- a/pkg/model/components/clusterautoscaler.go +++ b/pkg/model/components/clusterautoscaler.go @@ -43,8 +43,10 @@ func (b *ClusterAutoscalerOptionsBuilder) BuildOptions(o interface{}) error { v, err := util.ParseKubernetesVersion(clusterSpec.KubernetesVersion) if err == nil { switch v.Minor { + case 25: + image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0" case 24: - image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0" + image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0" case 23: image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0" case 22: diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content index 626f6105d2..f4dedd0f36 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_cluster-completed.spec_content @@ -34,7 +34,7 @@ spec: balanceSimilarNodeGroups: false enabled: true expander: random - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0 + image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0 maxNodeProvisionTime: 15m0s newPodScaleUpDelay: 0s scaleDownDelayAfterAdd: 10m0s diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index aee1131742..a9dda97e10 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -54,7 +54,7 @@ spec: version: 9.99.0 - id: k8s-1.15 manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml - manifestHash: f13e6bf966ee667fbd71f68101f17f2b6c7dfb31a1ae0e8e5c4c52928c0102ba + manifestHash: 4ff913cad3cff028df2ea982f3fb01e109a85ff119560615186d4e1d708d7f08 name: cluster-autoscaler.addons.k8s.io selector: k8s-addon: cluster-autoscaler.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content index 0c4c020860..71a8db843c 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa24/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content @@ -333,7 +333,7 @@ spec: value: arn:aws-test:iam::123456789012:role/cluster-autoscaler.kube-system.sa.minimal.example.com - name: AWS_WEB_IDENTITY_TOKEN_FILE value: /var/run/secrets/amazonaws.com/token - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.0 + image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3