Update Cluster Autoscaler 1-26 to latest

Signed-off-by: Rahul Ganesh <[email protected]>

UPSTREAM_PROJECTS.yaml

@@ -139,7 +139,7 @@ projects:
         versions:
           - commit: e8d3e9b1d986d540a21913b756cb2b47ffddb918
             go_version: "1.19"
-          - commit: f48095c20ad1b305a1392a3a031b0a7e31e1927a
+          - tag: cluster-autoscaler-1.26.6
             go_version: "1.19"
           - tag: cluster-autoscaler-1.27.5
             go_version: "1.20"

projects/kubernetes/autoscaler/1-26/CHECKSUMS

@@ -1,2 +1,2 @@
-d00f17311d82f8c26928e5062bed9b6afabcf21c61807f0e0a4413cc97281dc9  _output/1-26/bin/autoscaler/linux-amd64/cluster-autoscaler
-4c2f4a02d2952759832cab0e32cc795b2756d8e0d0b026819811c1fc58dc0725  _output/1-26/bin/autoscaler/linux-arm64/cluster-autoscaler
+8e95fa17860c8e8f6f89b24e2e94a3160ff3de2cbfac569c6514d0bdf60ca355  _output/1-26/bin/autoscaler/linux-amd64/cluster-autoscaler
+8699e85716e5006a2ca7ff956e90e4949241c816265fd8a595ed9fdcfe5549ec  _output/1-26/bin/autoscaler/linux-arm64/cluster-autoscaler

projects/kubernetes/autoscaler/1-26/GIT_TAG

@@ -1 +1 @@
-f48095c20ad1b305a1392a3a031b0a7e31e1927a
+cluster-autoscaler-1.26.6

projects/kubernetes/autoscaler/1-26/HELM_GIT_TAG

@@ -1 +1 @@
-cluster-autoscaler-chart-9.21.0
+cluster-autoscaler-chart-9.34.0

projects/kubernetes/autoscaler/1-26/helm/patches/0002-Set-clusterapi-as-default-cloud-provider.patch → projects/kubernetes/autoscaler/1-26/helm/patches/0001-Set-clusterapi-as-default-cloud-provider.patch

@@ -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
 

projects/kubernetes/autoscaler/1-26/helm/patches/0005-Use-imagePullSecrets-instead-of-pullSecrets.patch → projects/kubernetes/autoscaler/1-26/helm/patches/0002-Add-image-values.patch

@@ -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:
@@ -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 }}
@@ -36,26 +45,43 @@ 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

projects/kubernetes/autoscaler/1-26/patches/0001-Remove-Cloud-Provider-Builders-Except-Cluster-API.patch

@@ -1,9 +1,9 @@
-From 538255cec1c4a20742d85599325a0c055a4327d3 Mon Sep 17 00:00:00 2001
+From 5228ba4a0079b293396369c40422e3f296c6dae8 Mon Sep 17 00:00:00 2001
 From: Prow Bot <[email protected]>
-Date: Thu, 13 Apr 2023 10:46:50 -0400
-Subject: [PATCH] Remove Cloud Provider Builders Except Cluster API
+Date: Mon, 29 Jan 2024 23:17:56 +0000
+Subject: [PATCH] Remove Cloud Provider Builders Except Cluster-API
 
-Removes cloud builder dependency on cloud providers.
+Signed-off-by: Prow Bot <[email protected]>
 ---
  .../cloudprovider/builder/builder_alicloud.go |  43 --------
  .../cloudprovider/builder/builder_all.go      | 104 ------------------
@@ -112,7 +112,7 @@ index 38748c5f8..000000000
 -	return nil
 -}
 diff --git a/cluster-autoscaler/cloudprovider/builder/builder_all.go b/cluster-autoscaler/cloudprovider/builder/builder_all.go
-index fd68a6e6c..3e38e30c1 100644
+index c23c827d6..309eebf29 100644
 --- a/cluster-autoscaler/cloudprovider/builder/builder_all.go
 +++ b/cluster-autoscaler/cloudprovider/builder/builder_all.go
 @@ -21,65 +21,13 @@ package builder
@@ -1224,12 +1224,12 @@ index 55756f147..000000000
 -}
 diff --git a/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go b/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go
 deleted file mode 100644
-index 680cdc55c..000000000
+index 6eddfc0cf..000000000
 --- a/cluster-autoscaler/cloudprovider/builder/builder_ovhcloud.go
 +++ /dev/null
 @@ -1,42 +0,0 @@
--//go:build exoscale
--// +build exoscale
+-//go:build ovhcloud
+-// +build ovhcloud
 -
 -/*
 -Copyright 2020 The Kubernetes Authors.
@@ -1515,5 +1515,5 @@ index e6c20b814..000000000
 -	return nil
 -}
 -- 
-2.37.1 (Apple Git-137.1)
+2.25.1