-
Notifications
You must be signed in to change notification settings - Fork 90
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update Helm patches against the new git tags
Signed-off-by: Rahul Ganesh <[email protected]>
- Loading branch information
Rahul Ganesh
committed
Jan 26, 2024
1 parent
9f1f29d
commit 7ad658e
Showing
4 changed files
with
31 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
12 changes: 6 additions & 6 deletions
12
...bernetes/autoscaler/1-28/helm/patches/0001-Set-clusterapi-as-default-cloud-provider.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,25 +1,25 @@ | ||
From 418d1c585ab1eacc81b82ecec8aef057d828d78d 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 1a4c1bcf3..7efb0f67c 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.25.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,18 @@ | ||
From cb99b86bf99926bd57c7f896b9ba922e101810f0 Mon Sep 17 00:00:00 2001 | ||
From a951c07b2633950debe034c32d9df2f37ebe73b5 Mon Sep 17 00:00:00 2001 | ||
From: Prow Bot <[email protected]> | ||
Date: Thu, 15 Sep 2022 10:30:11 -0400 | ||
Subject: [PATCH] Add image values | ||
|
||
--- | ||
.../templates/deployment.yaml | 12 +++++------- | ||
charts/cluster-autoscaler/values.yaml | 19 +++++++++---------- | ||
2 files changed, 14 insertions(+), 17 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 2801a8ce9..8f743f4f6 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: | ||
|
@@ -23,7 +23,7 @@ index 2801a8ce9..8f743f4f6 100644 | |
{{- if .Values.priorityClassName }} | ||
priorityClassName: "{{ .Values.priorityClassName }}" | ||
{{- end }} | ||
@@ -44,7 +48,7 @@ spec: | ||
@@ -48,7 +52,7 @@ spec: | ||
{{- end }} | ||
containers: | ||
- name: {{ template "cluster-autoscaler.name" . }} | ||
|
@@ -32,7 +32,7 @@ index 2801a8ce9..8f743f4f6 100644 | |
imagePullPolicy: "{{ .Values.image.pullPolicy }}" | ||
command: | ||
- ./cluster-autoscaler | ||
@@ -288,11 +292,5 @@ spec: | ||
@@ -333,11 +337,5 @@ spec: | ||
secret: | ||
secretName: {{ .Values.clusterAPIKubeconfigSecret }} | ||
{{- end }} | ||
|
@@ -45,24 +45,29 @@ index 2801a8ce9..8f743f4f6 100644 | |
{{- end }} | ||
{{- end }} | ||
diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml | ||
index 7efb0f67c..08ad944ab 100644 | ||
index 20c2c1479..9157801ae 100644 | ||
--- a/charts/cluster-autoscaler/values.yaml | ||
+++ b/charts/cluster-autoscaler/values.yaml | ||
@@ -229,20 +229,19 @@ extraVolumeMounts: [] | ||
@@ -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: k8s.gcr.io/autoscaling/cluster-autoscaler | ||
- repository: registry.k8s.io/autoscaling/cluster-autoscaler | ||
- # image.tag -- Image tag | ||
- tag: v1.23.0 | ||
- 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. | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
From caa34f389bd80353b3219c22574fe47848bd3e64 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 | ||
|
@@ -13,14 +13,15 @@ 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 | ||
|