diff --git a/pkg/model/components/clusterautoscaler.go b/pkg/model/components/clusterautoscaler.go index 4d90f365b0..ec5ca474e6 100644 --- a/pkg/model/components/clusterautoscaler.go +++ b/pkg/model/components/clusterautoscaler.go @@ -43,18 +43,20 @@ 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.25.0" - case 24: - image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0" - case 23: - image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1" - case 22: - image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.3" case 21: image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.21.3" - default: + case 22: + image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.22.3" + case 23: + image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.23.1" + case 24: + image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.24.0" + case 25: image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0" + case 26: + image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0" + default: + image = "registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0" } } cas.Image = fi.PtrTo(image) diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content index c7413efe1a..fc936e504a 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_cluster-completed.spec_content @@ -33,7 +33,7 @@ spec: balanceSimilarNodeGroups: false enabled: true expander: random - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0 + image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0 maxNodeProvisionTime: 15m0s newPodScaleUpDelay: 0s scaleDownDelayAfterAdd: 10m0s diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 7047345999..080e368535 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-ccm-irsa26/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.15 manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml - manifestHash: 7b18a30ca3e842db84aabd59434c8d2c7de35a38c9ebaff9ba203b4cc3a82e1b + manifestHash: 10c96e535d61975b58b27ac8beef2da578df330febaed51db73c249d545d20da name: cluster-autoscaler.addons.k8s.io selector: k8s-addon: cluster-autoscaler.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-ccm-irsa26/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-irsa26/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content index 07b10b51d7..f00efd4438 100644 --- a/tests/integration/update_cluster/many-addons-ccm-irsa26/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-irsa26/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content @@ -344,7 +344,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.25.0 + image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3 diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content index de54f28d10..6504d251fb 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_cluster-completed.spec_content @@ -31,7 +31,7 @@ spec: balanceSimilarNodeGroups: false enabled: true expander: random - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0 + image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0 maxNodeProvisionTime: 15m0s newPodScaleUpDelay: 0s scaleDownDelayAfterAdd: 10m0s diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content index 6a50bb4c8f..d730840f5a 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-bootstrap_content @@ -41,7 +41,7 @@ spec: version: 9.99.0 - id: k8s-1.15 manifest: cluster-autoscaler.addons.k8s.io/k8s-1.15.yaml - manifestHash: 5253c30e7851d3ff94e7e8cda8fd4e780ce3d3abe0e25c2e5c4e395dc6a4b732 + manifestHash: c4b9cdc4f3dc1724be5ea9e62abe442ec7afc53a64d290924b13f9ccdea95551 name: cluster-autoscaler.addons.k8s.io selector: k8s-addon: cluster-autoscaler.addons.k8s.io diff --git a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content index 02bbaa115a..5f7a9665ef 100644 --- a/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content +++ b/tests/integration/update_cluster/many-addons-gce/data/aws_s3_object_minimal.example.com-addons-cluster-autoscaler.addons.k8s.io-k8s-1.15_content @@ -338,7 +338,7 @@ spec: - --logtostderr=true - --stderrthreshold=info - --v=4 - image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.25.0 + image: registry.k8s.io/autoscaling/cluster-autoscaler:v1.26.0 imagePullPolicy: IfNotPresent livenessProbe: failureThreshold: 3