feat: add support for multiple expanders in v1.23.0

kubernetes · Feb 4, 2022 · e85b2e8 · e85b2e8
1 parent 994fbac
commit e85b2e8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/charts/cluster-autoscaler/Chart.yaml b/charts/cluster-autoscaler/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 1.21.1
+appVersion: 1.23.0
 description: Scales Kubernetes worker nodes within autoscaling groups.
 engine: gotpl
 home: https://github.com/kubernetes/autoscaler
@@ -17,4 +17,4 @@ name: cluster-autoscaler
 sources:
   - https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler
 type: application
-version: 9.13.0
+version: 9.14.0
diff --git a/charts/cluster-autoscaler/templates/_helpers.tpl b/charts/cluster-autoscaler/templates/_helpers.tpl
@@ -85,3 +85,13 @@ Return the service account name used by the pod.
     {{ default "default" .Values.rbac.serviceAccount.name }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Return true if the priority expander is enabled
+*/}}
+{{- define "cluster-autoscaler.priorityExpanderEnabled" -}}
+{{- $expanders := splitList "," (default "" .Values.extraArgs.expander) -}}
+{{- if has "priority" $expanders -}}
+{{- true -}}
+{{- end -}}
+{{- end -}}
diff --git a/charts/cluster-autoscaler/templates/priority-expander-configmap.yaml b/charts/cluster-autoscaler/templates/priority-expander-configmap.yaml
@@ -1,5 +1,5 @@
 {{- if hasKey .Values.extraArgs "expander" }}
-{{- if and (.Values.expanderPriorities) (eq .Values.extraArgs.expander "priority") -}}
+{{- if and (.Values.expanderPriorities) (include "cluster-autoscaler.priorityExpanderEnabled" . ) -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:

diff --git a/charts/cluster-autoscaler/templates/role.yaml b/charts/cluster-autoscaler/templates/role.yaml
@@ -12,7 +12,7 @@ rules:
       - configmaps
     verbs:
       - create
-{{- if eq (default "" .Values.extraArgs.expander) "priority" }}
+{{- if (include "cluster-autoscaler.priorityExpanderEnabled" . ) }}
       - list
       - watch
 {{- end }}
@@ -22,14 +22,14 @@ rules:
       - configmaps
     resourceNames:
       - cluster-autoscaler-status
-{{- if eq (default "" .Values.extraArgs.expander) "priority" }}
+{{- if (include "cluster-autoscaler.priorityExpanderEnabled" . ) }}
       - cluster-autoscaler-priority-expander
 {{- end }}
     verbs:
       - delete
       - get
       - update
-{{- if eq (default "" .Values.extraArgs.expander) "priority" }}
+{{- if (include "cluster-autoscaler.priorityExpanderEnabled" . ) }}
       - watch
 {{- end }}
 {{- if  eq (default "" (index .Values.extraArgs "leader-elect-resource-lock")) "configmaps" }}

diff --git a/charts/cluster-autoscaler/values.yaml b/charts/cluster-autoscaler/values.yaml
@@ -204,7 +204,7 @@ image:
   # image.repository -- Image repository
   repository: k8s.gcr.io/autoscaling/cluster-autoscaler
   # image.tag -- Image tag
-  tag: v1.21.1
+  tag: v1.23.0
   # image.pullPolicy -- Image pull policy
   pullPolicy: IfNotPresent
   ## Optionally specify an array of imagePullSecrets.