Update Autoscaler to latest version for 1-27 to 1-31 (#3841)

* Update patch for 1.28 * Updated autoscaler to latest for k8s 1.28 * Updated autoscaler to latest for k8s 1.29 * Updated autoscaler to latest for k8s 1.30 * Updated autoscaler to latest for k8s 1.31 * Updated autoscaler to latest for k8s 1.27 * update README.md * Update patch for 1-28
aws · Oct 2, 2024 · a9d5f75 · a9d5f75
1 parent cc31c80
commit a9d5f75
Show file tree

Hide file tree

Showing 30 changed files with 969 additions and 1,364 deletions.
diff --git a/UPSTREAM_PROJECTS.yaml b/UPSTREAM_PROJECTS.yaml
@@ -145,13 +145,13 @@ projects:
         versions:
           - tag: cluster-autoscaler-1.27.8
             go_version: "1.20"
-          - tag: cluster-autoscaler-1.28.5
+          - tag: cluster-autoscaler-1.28.6
             go_version: "1.20"
-          - tag: cluster-autoscaler-1.29.3
+          - tag: cluster-autoscaler-1.29.4
             go_version: "1.21"
-          - tag: cluster-autoscaler-1.30.1
+          - tag: cluster-autoscaler-1.30.2
             go_version: "1.22"
-          - tag: cluster-autoscaler-1.30.1
+          - tag: cluster-autoscaler-1.31.0
             go_version: "1.22"
       - name: cloud-provider-aws
         versions:

diff --git a/projects/kubernetes/autoscaler/1-27/HELM_GIT_TAG b/projects/kubernetes/autoscaler/1-27/HELM_GIT_TAG
@@ -1 +1 @@
-cluster-autoscaler-chart-9.37.0
+cluster-autoscaler-chart-9.40.0
diff --git a/projects/kubernetes/autoscaler/1-27/helm/patches/0002-Add-image-values.patch b/projects/kubernetes/autoscaler/1-27/helm/patches/0002-Add-image-values.patch
@@ -1,12 +1,12 @@
-From 406c2a20a353a0a0c3bce2e724861dbeef35a2df Mon Sep 17 00:00:00 2001
+From b3dd3252a71532a54804fbdc2e1a263f99086069 Mon Sep 17 00:00:00 2001
 From: Prow Bot <prow@amazonaws.com>
-Date: Thu, 15 Sep 2022 10:30:11 -0400
+Date: Tue, 1 Oct 2024 23:40:41 -0700
 Subject: [PATCH] Add image values
 
 ---
- .../templates/deployment.yaml                 | 12 +++++------
- charts/cluster-autoscaler/values.yaml         | 20 +++++++++----------
- 2 files changed, 15 insertions(+), 17 deletions(-)
+ .../templates/deployment.yaml                 | 12 +++++-------
+ charts/cluster-autoscaler/values.yaml         | 19 +++++++++----------
+ 2 files changed, 14 insertions(+), 17 deletions(-)
 
 diff --git a/charts/cluster-autoscaler/templates/deployment.yaml b/charts/cluster-autoscaler/templates/deployment.yaml
 index 1b06186bf..0324e1181 100644
@@ -45,10 +45,10 @@ index 1b06186bf..0324e1181 100644
      {{- end }}
  {{- end }}
 diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
-index 54e6b13f5..4d824497b 100644
+index 10055a035..60a5b05a0 100644
 --- a/charts/cluster-autoscaler/values.yaml
 +++ b/charts/cluster-autoscaler/values.yaml
-@@ -232,20 +232,20 @@ fullnameOverride: ""
+@@ -250,20 +250,19 @@ fullnameOverride: ""
  # hostNetwork -- Whether to expose network interfaces of the host machine to pods.
  hostNetwork: false
 
@@ -59,11 +59,10 @@ index 54e6b13f5..4d824497b 100644
    # image.repository -- Image repository
 -  repository: registry.k8s.io/autoscaling/cluster-autoscaler
 -  # image.tag -- Image tag
--  tag: v1.30.0
+-  tag: v1.31.0
 +  repository: kubernetes/autoscaler
 +  # image.digest -- Image digest
 +  digest: {{kubernetes/autoscaler}}
-+
    # image.pullPolicy -- Image pull policy
    pullPolicy: IfNotPresent
 -  ## Optionally specify an array of imagePullSecrets.
@@ -80,5 +79,5 @@ index 54e6b13f5..4d824497b 100644
  # kubeTargetVersionOverride -- Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands.
  kubeTargetVersionOverride: ""
 -- 
-2.40.1
+2.44.0
 
diff --git a/projects/kubernetes/autoscaler/1-28/ATTRIBUTION.txt b/projects/kubernetes/autoscaler/1-28/ATTRIBUTION.txt
@@ -131,46 +131,46 @@ https://github.com/grpc/grpc-go
 ** gopkg.in/yaml.v2; version v2.4.0 --
 https://gopkg.in/yaml.v2
 
-** k8s.io/api; version v0.28.10 --
+** k8s.io/api; version v0.28.11 --
 https://github.com/kubernetes/api
 
-** k8s.io/apiextensions-apiserver/pkg/features; version v0.28.10 --
+** k8s.io/apiextensions-apiserver/pkg/features; version v0.28.11 --
 https://github.com/kubernetes/apiextensions-apiserver
 
-** k8s.io/apimachinery/pkg; version v0.28.10 --
+** k8s.io/apimachinery/pkg; version v0.28.11 --
 https://github.com/kubernetes/apimachinery
 
-** k8s.io/apiserver; version v0.28.10 --
+** k8s.io/apiserver; version v0.28.11 --
 https://github.com/kubernetes/apiserver
 
-** k8s.io/autoscaler/cluster-autoscaler; version cluster-autoscaler-1.28.5 --
+** k8s.io/autoscaler/cluster-autoscaler; version cluster-autoscaler-1.28.6 --
 https://github.com/kubernetes/autoscaler
 
-** k8s.io/client-go; version v0.28.10 --
+** k8s.io/client-go; version v0.28.11 --
 https://github.com/kubernetes/client-go
 
-** k8s.io/cloud-provider; version v0.28.10 --
+** k8s.io/cloud-provider; version v0.28.11 --
 https://github.com/kubernetes/cloud-provider
 
-** k8s.io/component-base; version v0.28.10 --
+** k8s.io/component-base; version v0.28.11 --
 https://github.com/kubernetes/component-base
 
-** k8s.io/component-helpers; version v0.28.10 --
+** k8s.io/component-helpers; version v0.28.11 --
 https://github.com/kubernetes/component-helpers
 
-** k8s.io/controller-manager; version v0.28.10 --
+** k8s.io/controller-manager; version v0.28.11 --
 https://github.com/kubernetes/controller-manager
 
-** k8s.io/csi-translation-lib; version v0.28.10 --
+** k8s.io/csi-translation-lib; version v0.28.11 --
 https://github.com/kubernetes/csi-translation-lib
 
-** k8s.io/dynamic-resource-allocation/resourceclaim; version v0.28.10 --
+** k8s.io/dynamic-resource-allocation/resourceclaim; version v0.28.11 --
 https://github.com/kubernetes/dynamic-resource-allocation
 
 ** k8s.io/klog/v2; version v2.100.1 --
 https://github.com/kubernetes/klog
 
-** k8s.io/kms; version v0.28.10 --
+** k8s.io/kms; version v0.28.11 --
 https://github.com/kubernetes/kms
 
 ** k8s.io/kube-openapi/pkg; version v0.0.0-20230717233707-2695361300d9 --
@@ -185,16 +185,16 @@ https://github.com/kubernetes/kube-openapi
 ** k8s.io/kube-openapi/pkg/validation/strfmt; version v0.0.0-20230717233707-2695361300d9 --
 https://github.com/kubernetes/kube-openapi
 
-** k8s.io/kube-scheduler; version v0.28.10 --
+** k8s.io/kube-scheduler; version v0.28.11 --
 https://github.com/kubernetes/kube-scheduler
 
-** k8s.io/kubelet/pkg/apis; version v0.28.10 --
+** k8s.io/kubelet/pkg/apis; version v0.28.11 --
 https://github.com/kubernetes/kubelet
 
-** k8s.io/kubernetes/pkg; version v1.28.10 --
+** k8s.io/kubernetes/pkg; version v1.28.11 --
 https://github.com/kubernetes/kubernetes
 
-** k8s.io/mount-utils; version v0.28.10 --
+** k8s.io/mount-utils; version v0.28.11 --
 https://github.com/kubernetes/mount-utils
 
 ** k8s.io/utils; version v0.0.0-20230406110748-d93618cff8a2 --
@@ -1003,7 +1003,7 @@ https://golang.org/x/text
 ** golang.org/x/time/rate; version v0.3.0 --
 https://golang.org/x/time
 
-** k8s.io/apimachinery/third_party/forked/golang; version v0.28.10 --
+** k8s.io/apimachinery/third_party/forked/golang; version v0.28.11 --
 https://github.com/kubernetes/apimachinery
 
 Copyright (c) 2009 The Go Authors. All rights reserved.

diff --git a/projects/kubernetes/autoscaler/1-28/CHECKSUMS b/projects/kubernetes/autoscaler/1-28/CHECKSUMS
@@ -1,2 +1,2 @@
-e015b7723e9b93245ce32266da5d4aa2ff8f64b2d681843e35d331dc7eedfb1c  _output/1-28/bin/autoscaler/linux-amd64/cluster-autoscaler
-820a8d60f3eba25d8ca40c1d221e33be55772d238fa59c287e039542af8978be  _output/1-28/bin/autoscaler/linux-arm64/cluster-autoscaler
+f8f281101444803c94afa9aa22096876b2c61497a8d56158c8072f1a99f2c458  _output/1-28/bin/autoscaler/linux-amd64/cluster-autoscaler
+f81fef5375172034b857a6be0bbc7530933744b6aaaead71b36f517c48766eca  _output/1-28/bin/autoscaler/linux-arm64/cluster-autoscaler
diff --git a/projects/kubernetes/autoscaler/1-28/GIT_TAG b/projects/kubernetes/autoscaler/1-28/GIT_TAG
@@ -1 +1 @@
-cluster-autoscaler-1.28.5
+cluster-autoscaler-1.28.6
diff --git a/projects/kubernetes/autoscaler/1-28/HELM_GIT_TAG b/projects/kubernetes/autoscaler/1-28/HELM_GIT_TAG
@@ -1 +1 @@
-cluster-autoscaler-chart-9.37.0
+cluster-autoscaler-chart-9.40.0
diff --git a/projects/kubernetes/autoscaler/1-28/helm/patches/0002-Add-image-values.patch b/projects/kubernetes/autoscaler/1-28/helm/patches/0002-Add-image-values.patch
@@ -1,14 +1,12 @@
-From 425c4836f440ea88974a969ba73028c56da366c8 Mon Sep 17 00:00:00 2001
+From ac5be4595d6db0af9a55c642f7e4fa24e7ed4513 Mon Sep 17 00:00:00 2001
 From: Prow Bot <prow@amazonaws.com>
-Date: Mon, 10 Jun 2024 21:25:54 +0000
+Date: Fri, 27 Sep 2024 18:36:19 -0700
 Subject: [PATCH] Add image values
 
 ---
- .../templates/deployment.yaml                 | 12 +++----
- charts/cluster-autoscaler/values.yaml         | 20 +++++------
- charts/cluster-autoscaler/values.yaml.rej     | 36 +++++++++++++++++++
- 3 files changed, 51 insertions(+), 17 deletions(-)
- create mode 100644 charts/cluster-autoscaler/values.yaml.rej
+ .../templates/deployment.yaml                   | 12 +++++-------
+ charts/cluster-autoscaler/values.yaml           | 17 +++++++----------
+ 2 files changed, 12 insertions(+), 17 deletions(-)
 
 diff --git a/charts/cluster-autoscaler/templates/deployment.yaml b/charts/cluster-autoscaler/templates/deployment.yaml
 index 1b06186bf..0324e1181 100644
@@ -47,10 +45,10 @@ index 1b06186bf..0324e1181 100644
      {{- end }}
  {{- end }}
 diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
-index 54e6b13f5..40f66189b 100644
+index 10055a035..39d4e3122 100644
 --- a/charts/cluster-autoscaler/values.yaml
 +++ b/charts/cluster-autoscaler/values.yaml
-@@ -232,20 +232,20 @@ fullnameOverride: ""
+@@ -250,21 +250,18 @@ fullnameOverride: ""
  # hostNetwork -- Whether to expose network interfaces of the host machine to pods.
  hostNetwork: false
 
@@ -61,11 +59,10 @@ index 54e6b13f5..40f66189b 100644
    # image.repository -- Image repository
 -  repository: registry.k8s.io/autoscaling/cluster-autoscaler
 -  # image.tag -- Image tag
--  tag: v1.30.0
+-  tag: v1.31.0
 +  repository: kubernetes/autoscaler
-+  # image.digest -- Image digest
++  # image.digest -- Image Digest
 +  digest: {{kubernetes/autoscaler}}
-+  
    # image.pullPolicy -- Image pull policy
    pullPolicy: IfNotPresent
 -  ## Optionally specify an array of imagePullSecrets.
@@ -75,54 +72,11 @@ index 54e6b13f5..40f66189b 100644
 -  # image.pullSecrets -- Image pull secrets
 -  pullSecrets: []
 -  # - myRegistrKeySecretName
-+  
-+# image pull secrets
-+imagePullSecrets: []
 
++imagePullSecrets: []
  # kubeTargetVersionOverride -- Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands.
  kubeTargetVersionOverride: ""
-diff --git a/charts/cluster-autoscaler/values.yaml.rej b/charts/cluster-autoscaler/values.yaml.rej
-new file mode 100644
-index 000000000..09c845102
---- /dev/null
-+++ b/charts/cluster-autoscaler/values.yaml.rej
-@@ -0,0 +1,36 @@
-+diff a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml	(rejected hunks)
-+@@ -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: []
-+-  # - myRegistrKeySecretName
-++
-++# image pull secrets
-++imagePullSecrets: []
-+ 
-+ # kubeTargetVersionOverride -- Allow overriding the `.Capabilities.KubeVersion.GitVersion` check. Useful for `helm template` commands.
-+ kubeTargetVersionOverride: ""
+
 -- 
-2.40.1
+2.44.0