Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump Autoscaler to latest version for release branch 1-28 #2853

Merged
merged 2 commits into from
Jan 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion UPSTREAM_PROJECTS.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ projects:
go_version: "1.19"
- commit: 299c9637229fb2bf849c1d86243fe2948d14101e
go_version: "1.20"
- commit: 5bcb526e08c17ff93cc6093ee89a95730a90e45b
- tag: cluster-autoscaler-1.28.2
go_version: "1.20"
- commit: 1caf2ddb61efd51b3c7c4c1837d8f7655abbef13
go_version: "1.21"
Expand Down
4 changes: 2 additions & 2 deletions projects/kubernetes/autoscaler/1-28/CHECKSUMS
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
38d42f6f0f38a5ee590a269acfeb519c8aa492b988bcdfe36c36d3deb16a1d59 _output/1-28/bin/autoscaler/linux-amd64/cluster-autoscaler
5337275d5b278e3580e88147a9fe4d36e3d1782953a3c13d3ba5cc67939d2958 _output/1-28/bin/autoscaler/linux-arm64/cluster-autoscaler
e47986f4a60d8d1ee8333483c770b0441ca9c8cfb404e2f544e652cde1b1c6cf _output/1-28/bin/autoscaler/linux-amd64/cluster-autoscaler
4fdd910e2708edfee4c75024931784e2b762ea135841430625cb76f5fdf5af80 _output/1-28/bin/autoscaler/linux-arm64/cluster-autoscaler
2 changes: 1 addition & 1 deletion projects/kubernetes/autoscaler/1-28/GIT_TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5bcb526e08c17ff93cc6093ee89a95730a90e45b
cluster-autoscaler-1.28.2
2 changes: 1 addition & 1 deletion projects/kubernetes/autoscaler/1-28/HELM_GIT_TAG
Original file line number Diff line number Diff line change
@@ -1 +1 @@
cluster-autoscaler-chart-9.21.0
cluster-autoscaler-chart-9.34.0

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
From aeec86d0f138418c38e0ae5ced7beb20697cbb3d Mon Sep 17 00:00:00 2001
From 65a72e302defa7e99891798b659209f35fdb5766 Mon Sep 17 00:00:00 2001
From: Prow Bot <[email protected]>
Date: Thu, 15 Sep 2022 16:04:15 -0400
Date: Wed, 24 Jan 2024 20:35:11 +0000
Subject: [PATCH] Set clusterapi as default cloud provider

---
charts/cluster-autoscaler/values.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
index 2dea5c0d2..3b3476b55 100644
index cc1cd6633..20c2c1479 100644
--- a/charts/cluster-autoscaler/values.yaml
+++ b/charts/cluster-autoscaler/values.yaml
@@ -131,7 +131,7 @@ cloudConfigPath: ""
@@ -103,7 +103,7 @@ cloudConfigPath: ""
# Currently only `gce`, `aws`, `azure`, `magnum` and `clusterapi` are supported.
# `aws` supported for AWS. `gce` for GCE. `azure` for Azure AKS.
# `magnum` for OpenStack Magnum, `clusterapi` for Cluster API.
-cloudProvider: aws
+cloudProvider: clusterapi

# containerSecurityContext -- [Security context for container](https://kubernetes.io/docs/tasks/configure-pod-container/security-context/)
containerSecurityContext: {}
# clusterAPICloudConfigPath -- Path to kubeconfig for connecting to Cluster API Management Cluster, only used if `clusterAPIMode=kubeconfig-kubeconfig or incluster-kubeconfig`
clusterAPICloudConfigPath: /etc/kubernetes/mgmt-kubeconfig
--
2.30.1 (Apple Git-130)
2.25.1

Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From d760d1c9a549ea6ee838d9da82e1225b970651f3 Mon Sep 17 00:00:00 2001
From a951c07b2633950debe034c32d9df2f37ebe73b5 Mon Sep 17 00:00:00 2001
From: Prow Bot <[email protected]>
Date: Wed, 12 Oct 2022 13:12:22 -0400
Subject: [PATCH] Use imagePullSecrets instead of pullSecrets
Date: Thu, 15 Sep 2022 10:30:11 -0400
Subject: [PATCH] Add image values

---
charts/cluster-autoscaler/templates/deployment.yaml | 10 ++++------
charts/cluster-autoscaler/values.yaml | 10 +++-------
2 files changed, 7 insertions(+), 13 deletions(-)
.../templates/deployment.yaml | 12 +++++------
charts/cluster-autoscaler/values.yaml | 21 ++++++++++---------
2 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/charts/cluster-autoscaler/templates/deployment.yaml b/charts/cluster-autoscaler/templates/deployment.yaml
index bbd22d27f..5cfca0daf 100644
index 113d92971..82a51bf2d 100644
--- a/charts/cluster-autoscaler/templates/deployment.yaml
+++ b/charts/cluster-autoscaler/templates/deployment.yaml
@@ -36,6 +36,10 @@ spec:
@@ -37,6 +37,10 @@ spec:
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
spec:
Expand All @@ -23,7 +23,16 @@ index bbd22d27f..5cfca0daf 100644
{{- if .Values.priorityClassName }}
priorityClassName: "{{ .Values.priorityClassName }}"
{{- end }}
@@ -288,11 +292,5 @@ spec:
@@ -48,7 +52,7 @@ spec:
{{- end }}
containers:
- name: {{ template "cluster-autoscaler.name" . }}
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ image: "{{ .Values.sourceRegistry }}/{{ .Values.image.repository }}@{{ .Values.image.digest }}"
imagePullPolicy: "{{ .Values.image.pullPolicy }}"
command:
- ./cluster-autoscaler
@@ -333,11 +337,5 @@ spec:
secret:
secretName: {{ .Values.clusterAPIKubeconfigSecret }}
{{- end }}
Expand All @@ -36,26 +45,44 @@ index bbd22d27f..5cfca0daf 100644
{{- end }}
{{- end }}
diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
index e556795f2..f88d5e60d 100644
index 20c2c1479..9157801ae 100644
--- a/charts/cluster-autoscaler/values.yaml
+++ b/charts/cluster-autoscaler/values.yaml
@@ -238,13 +238,9 @@ image:
digest: {{kubernetes/autoscaler}}
@@ -215,23 +215,24 @@ extraVolumeSecrets: {}
# fullnameOverride -- String to fully override `cluster-autoscaler.fullname` template.
fullnameOverride: ""

+
# hostNetwork -- Whether to expose network interfaces of the host machine to pods.
hostNetwork: false

+# sourceRegistry -- Image registry
+sourceRegistry: 783794618700.dkr.ecr.us-west-2.amazonaws.com
+
image:
# image.repository -- Image repository
- repository: registry.k8s.io/autoscaling/cluster-autoscaler
- # image.tag -- Image tag
- tag: v1.28.2
+ repository: kubernetes/autoscaler
+ # image.digest -- Image digest
+ digest: {{kubernetes/autoscaler}}
+
# image.pullPolicy -- Image pull policy
pullPolicy: IfNotPresent
- ## Optionally specify an array of imagePullSecrets.
- ## Secrets must be manually created in the namespace.
- ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/
- ##
- # image.pullSecrets -- Image pull secrets
- pullSecrets:
- - regcred
- pullSecrets: []
- # - myRegistrKeySecretName
+
+# image pull secrets
+imagePullSecrets: []

# kubeTargetVersionOverride -- Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands.
kubeTargetVersionOverride: ""
--
2.30.1 (Apple Git-130)
2.25.1

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From ce8b20934c6cba955f0b2c5ad06113588e750d30 Mon Sep 17 00:00:00 2001
From 435f87ce8476fbb1caf745a32350e0ed11272c89 Mon Sep 17 00:00:00 2001
From: Prow Bot <[email protected]>
Date: Mon, 22 May 2023 16:56:31 -0400
Subject: [PATCH] Authorize MachinePool Operations
Expand All @@ -13,18 +13,19 @@ To resolve this issue, we authorize appropriate operations on MachinePool resour
1 file changed, 2 insertions(+)

diff --git a/charts/cluster-autoscaler/templates/clusterrole.yaml b/charts/cluster-autoscaler/templates/clusterrole.yaml
index e3d36557f..63a65a044 100644
index 356b9c08d..b797e6fea 100644
--- a/charts/cluster-autoscaler/templates/clusterrole.yaml
+++ b/charts/cluster-autoscaler/templates/clusterrole.yaml
@@ -152,6 +152,8 @@ rules:
@@ -154,7 +154,9 @@ rules:
- cluster.x-k8s.io
resources:
- machinedeployments
- machinedeployments/scale
+ - machinepools
+ - machinedeployments/scale
- machinepools
+ - machinepools/scale
- machines
- machinesets
verbs:
--
2.37.1 (Apple Git-137.1)
2.25.1

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion projects/kubernetes/autoscaler/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
![1.25 Version](https://img.shields.io/badge/1--25%20version-e8d3e9b1d986d540a21913b756cb2b47ffddb918-blue)
![1.26 Version](https://img.shields.io/badge/1--26%20version-f48095c20ad1b305a1392a3a031b0a7e31e1927a-blue)
![1.27 Version](https://img.shields.io/badge/1--27%20version-299c9637229fb2bf849c1d86243fe2948d14101e-blue)
![1.28 Version](https://img.shields.io/badge/1--28%20version-5bcb526e08c17ff93cc6093ee89a95730a90e45b-blue)
![1.28 Version](https://img.shields.io/badge/1--28%20version-cluster--autoscaler--1.28.2-blue)
![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiL0tWckptdkxsZEd1cXNiNTBncjRNVU5oekpZRlBkTDNBcFVvZkFOVHZwbTBKUm91QkR6RVN4QlhJWk42cXF3L29FMmdnTXUrVndiay8zVUQ0YjJsc21vPSIsIml2UGFyYW1ldGVyU3BlYyI6Ik1Gd2UwbmRXVWxSRTMvUHQiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=main)

[Autoscaler](https://github.com/kubernetes/autoscaler) defines the cluster autoscaler.
Expand Down