Skip to content

Commit d469664

Browse files
peirulupeirulu
authored
Bump autoscaler version (#5127)
* Bump autoscaler version * Update README.md * Update checksum for 1-35 autoscaler * remove 1-28 autoscaler
1 parent fb6ea0a commit d469664

72 files changed

Lines changed: 3302 additions & 4631 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎UPSTREAM_PROJECTS.yaml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -160,19 +160,19 @@ projects:
160160
- name: autoscaler
161161
versions:
162162
- tag: cluster-autoscaler-1.29.5
163-
go_version: "1.21"
164-
- tag: cluster-autoscaler-1.30.4
165-
go_version: "1.23"
166-
- tag: cluster-autoscaler-1.31.2
167-
go_version: "1.23"
168-
- tag: cluster-autoscaler-1.32.1
169-
go_version: "1.23"
170-
- tag: cluster-autoscaler-1.33.0
171163
go_version: "1.24"
172-
- tag: cluster-autoscaler-1.34.1
164+
- tag: cluster-autoscaler-1.30.7
173165
go_version: "1.24"
174-
- tag: cluster-autoscaler-1.34.1
166+
- tag: cluster-autoscaler-1.31.5
175167
go_version: "1.24"
168+
- tag: cluster-autoscaler-1.32.4
169+
go_version: "1.24"
170+
- tag: cluster-autoscaler-1.33.3
171+
go_version: "1.24"
172+
- tag: cluster-autoscaler-1.34.2
173+
go_version: "1.24"
174+
- tag: cluster-autoscaler-1.35.0
175+
go_version: "1.25"
176176
- name: cloud-provider-aws
177177
versions:
178178
- tag: v1.29.6

‎projects/kubernetes/autoscaler/1-29/ATTRIBUTION.txt‎

Lines changed: 31 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -989,9 +989,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
989989

990990
------
991991

992-
** golang.org/go; version go1.21.13 --
992+
** golang.org/go; version go1.24.12 --
993993
https://github.com/golang/go
994994

995+
Copyright 2009 The Go Authors.
996+
997+
Redistribution and use in source and binary forms, with or without
998+
modification, are permitted provided that the following conditions are
999+
met:
1000+
1001+
* Redistributions of source code must retain the above copyright
1002+
notice, this list of conditions and the following disclaimer.
1003+
* Redistributions in binary form must reproduce the above
1004+
copyright notice, this list of conditions and the following disclaimer
1005+
in the documentation and/or other materials provided with the
1006+
distribution.
1007+
* Neither the name of Google LLC nor the names of its
1008+
contributors may be used to endorse or promote products derived from
1009+
this software without specific prior written permission.
1010+
1011+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
1012+
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
1013+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
1014+
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
1015+
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
1016+
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
1017+
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
1018+
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
1019+
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
1020+
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
1021+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1022+
1023+
------
1024+
9951025
** golang.org/x/crypto; version v0.22.0 --
9961026
https://golang.org/x/crypto
9971027

‎projects/kubernetes/autoscaler/1-29/CHECKSUMS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
e62dc2a84368250acf95433febfd345316737f20d2ebca091ccd9eae3230c542 _output/1-29/bin/autoscaler/linux-amd64/cluster-autoscaler
2-
f87891d8f6b65221f46f92d0766b90c13fd859f805c4991526109206bdf15bef _output/1-29/bin/autoscaler/linux-arm64/cluster-autoscaler
1+
4ae2af419fd3a8258dc0cd62bbce0bbaa79a5d0ecf055a781404848b7a0c8ef5 _output/1-29/bin/autoscaler/linux-amd64/cluster-autoscaler
2+
271bcce62812d7a8c73e43dbccb2b6b0d64447a1534f56203d4d748e7ce49f89 _output/1-29/bin/autoscaler/linux-arm64/cluster-autoscaler

‎projects/kubernetes/autoscaler/1-29/GOLANG_VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21
1+
1.24

‎projects/kubernetes/autoscaler/1-29/HELM_GIT_TAG‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
cluster-autoscaler-chart-9.43.2
1+
cluster-autoscaler-chart-9.55.0

‎projects/kubernetes/autoscaler/1-29/helm/patches/0001-Set-CAPI-as-default-cloud-provider.patch‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
From c97111ab94b127383135dc718ff89927724adfbb Mon Sep 17 00:00:00 2001
2+
From: Prow Bot <prow@amazonaws.com>
3+
Date: Sun, 20 Apr 2025 20:53:39 -0700
4+
Subject: [PATCH 1/3] Set-CAPI-as-default-cloud-provider
5+
6+
---
7+
cluster-autoscaler/charts/cluster-autoscaler/values.yaml | 2 +-
8+
1 file changed, 1 insertion(+), 1 deletion(-)
9+
10+
diff --git a/cluster-autoscaler/charts/cluster-autoscaler/values.yaml b/cluster-autoscaler/charts/cluster-autoscaler/values.yaml
11+
index 9e41d35bb..24d2e0e87 100644
12+
--- a/cluster-autoscaler/charts/cluster-autoscaler/values.yaml
13+
+++ b/cluster-autoscaler/charts/cluster-autoscaler/values.yaml
14+
@@ -138,7 +138,7 @@ cloudConfigPath: ""
15+
# `magnum` for OpenStack Magnum, `clusterapi` for Cluster API.
16+
# `civo` for Civo Cloud.
17+
# `coreweave` for CoreWeave.
18+
-cloudProvider: aws
19+
+cloudProvider: clusterapi
20+
21+
# clusterAPICloudConfigPath -- Path to kubeconfig for connecting to Cluster API Management Cluster, only used if `clusterAPIMode=kubeconfig-kubeconfig or incluster-kubeconfig`
22+
clusterAPICloudConfigPath: /etc/kubernetes/mgmt-kubeconfig
23+
--
24+
2.34.1
25+

‎projects/kubernetes/autoscaler/1-29/helm/patches/0001-Set-clusterapi-as-default-cloud-provider.patch‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎projects/kubernetes/autoscaler/1-29/helm/patches/0002-Add-image-values.patch‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
From a64acda5ea7015c4c7208c0893d8d4f3fa153c22 Mon Sep 17 00:00:00 2001
1+
From a7dee99f9ad612022fa0e8a20435cdd31e06e0ac Mon Sep 17 00:00:00 2001
22
From: Prow Bot <prow@amazonaws.com>
3-
Date: Mon, 30 Sep 2024 02:36:00 -0700
3+
Date: Tue, 1 Oct 2024 13:51:45 -0700
44
Subject: [PATCH 2/3] Add image values
55

66
---
77
.../templates/deployment.yaml | 12 +++++-------
8-
charts/cluster-autoscaler/values.yaml | 19 +++++++++----------
8+
.../charts/cluster-autoscaler/values.yaml | 19 +++++++++----------
99
2 files changed, 14 insertions(+), 17 deletions(-)
1010

11-
diff --git a/charts/cluster-autoscaler/templates/deployment.yaml b/charts/cluster-autoscaler/templates/deployment.yaml
12-
index 1b06186bf..0324e1181 100644
13-
--- a/charts/cluster-autoscaler/templates/deployment.yaml
14-
+++ b/charts/cluster-autoscaler/templates/deployment.yaml
15-
@@ -37,6 +37,10 @@ spec:
11+
diff --git a/cluster-autoscaler/charts/cluster-autoscaler/templates/deployment.yaml b/cluster-autoscaler/charts/cluster-autoscaler/templates/deployment.yaml
12+
index cb4982b37..4a13dc695 100644
13+
--- a/cluster-autoscaler/charts/cluster-autoscaler/templates/deployment.yaml
14+
+++ b/cluster-autoscaler/charts/cluster-autoscaler/templates/deployment.yaml
15+
@@ -41,6 +41,10 @@ spec:
1616
{{ toYaml .Values.podLabels | indent 8 }}
1717
{{- end }}
1818
spec:
@@ -23,7 +23,7 @@ index 1b06186bf..0324e1181 100644
2323
{{- if .Values.priorityClassName }}
2424
priorityClassName: "{{ .Values.priorityClassName }}"
2525
{{- end }}
26-
@@ -48,7 +52,7 @@ spec:
26+
@@ -60,7 +64,7 @@ spec:
2727
{{- end }}
2828
containers:
2929
- name: {{ template "cluster-autoscaler.name" . }}
@@ -32,7 +32,7 @@ index 1b06186bf..0324e1181 100644
3232
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
3333
command:
3434
- ./cluster-autoscaler
35-
@@ -329,11 +333,5 @@ spec:
35+
@@ -370,11 +374,5 @@ spec:
3636
secret:
3737
secretName: {{ .Values.clusterAPIKubeconfigSecret }}
3838
{{- end }}
@@ -44,11 +44,11 @@ index 1b06186bf..0324e1181 100644
4444
- {{- end }}
4545
{{- end }}
4646
{{- end }}
47-
diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
48-
index 10055a035..60a5b05a0 100644
49-
--- a/charts/cluster-autoscaler/values.yaml
50-
+++ b/charts/cluster-autoscaler/values.yaml
51-
@@ -250,20 +250,19 @@ fullnameOverride: ""
47+
diff --git a/cluster-autoscaler/charts/cluster-autoscaler/values.yaml b/cluster-autoscaler/charts/cluster-autoscaler/values.yaml
48+
index 24d2e0e87..8f376a52d 100644
49+
--- a/cluster-autoscaler/charts/cluster-autoscaler/values.yaml
50+
+++ b/cluster-autoscaler/charts/cluster-autoscaler/values.yaml
51+
@@ -296,20 +296,19 @@ fullnameOverride: ""
5252
# hostNetwork -- Whether to expose network interfaces of the host machine to pods.
5353
hostNetwork: false
5454

@@ -59,10 +59,10 @@ index 10055a035..60a5b05a0 100644
5959
# image.repository -- Image repository
6060
- repository: registry.k8s.io/autoscaling/cluster-autoscaler
6161
- # image.tag -- Image tag
62-
- tag: v1.31.0
62+
- tag: v1.34.2
6363
+ repository: kubernetes/autoscaler
6464
+ # image.digest -- Image digest
65-
+ digest: {{kubernetes/autoscaler}}
65+
+ digest: {{kubernetes/autoscaler}}
6666
# image.pullPolicy -- Image pull policy
6767
pullPolicy: IfNotPresent
6868
- ## Optionally specify an array of imagePullSecrets.
@@ -79,5 +79,5 @@ index 10055a035..60a5b05a0 100644
7979
# kubeTargetVersionOverride -- Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands.
8080
kubeTargetVersionOverride: ""
8181
--
82-
2.44.0
82+
2.34.1
8383

‎projects/kubernetes/autoscaler/1-29/helm/patches/0003-Authorize-MachinePool-Operations.patch‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
From 435f87ce8476fbb1caf745a32350e0ed11272c89 Mon Sep 17 00:00:00 2001
1+
From e098a3998cfa2c4a050cb4c5e3e7a3b9b499f416 Mon Sep 17 00:00:00 2001
22
From: Prow Bot <prow@amazonaws.com>
33
Date: Mon, 22 May 2023 16:56:31 -0400
4-
Subject: [PATCH] Authorize MachinePool Operations
4+
Subject: [PATCH 3/3] Authorize MachinePool Operations
55

66
https://github.com/kubernetes/autoscaler/pull/4676 Introduced a bug where the autoscaler runtime fails to reconcile other CAPI machine resources when its ClusterRole is not authorized to list and watch MachinePool resources.
77

88
See: https://github.com/kubernetes/autoscaler/commit/17d2bd968e756d97598be3ffb333957f0cfe99bf#diff-c8813a0942bbcd464aaa04a04c2c71897d5df30b65a2db86cb81773016f24406R786
99

1010
To resolve this issue, we authorize appropriate operations on MachinePool resources.
1111
---
12-
charts/cluster-autoscaler/templates/clusterrole.yaml | 2 ++
12+
.../charts/cluster-autoscaler/templates/clusterrole.yaml | 2 ++
1313
1 file changed, 2 insertions(+)
1414

15-
diff --git a/charts/cluster-autoscaler/templates/clusterrole.yaml b/charts/cluster-autoscaler/templates/clusterrole.yaml
16-
index 356b9c08d..b797e6fea 100644
17-
--- a/charts/cluster-autoscaler/templates/clusterrole.yaml
18-
+++ b/charts/cluster-autoscaler/templates/clusterrole.yaml
19-
@@ -154,7 +154,9 @@ rules:
15+
diff --git a/cluster-autoscaler/charts/cluster-autoscaler/templates/clusterrole.yaml b/cluster-autoscaler/charts/cluster-autoscaler/templates/clusterrole.yaml
16+
index e6a9018e6..1a6f68cdc 100644
17+
--- a/cluster-autoscaler/charts/cluster-autoscaler/templates/clusterrole.yaml
18+
+++ b/cluster-autoscaler/charts/cluster-autoscaler/templates/clusterrole.yaml
19+
@@ -186,7 +186,9 @@ rules:
2020
- cluster.x-k8s.io
2121
resources:
2222
- machinedeployments
@@ -27,5 +27,5 @@ index 356b9c08d..b797e6fea 100644
2727
- machinesets
2828
verbs:
2929
--
30-
2.25.1
30+
2.34.1
3131

0 commit comments

Comments
 (0)