From 5cde084a90d10cee25f24c96c53e0934000fa302 Mon Sep 17 00:00:00 2001 From: Gazal Date: Tue, 7 Apr 2020 01:21:48 +1000 Subject: [PATCH] fix: use correct reference to serviceAccount in _helpers.tpl (#21795) fix #21794 Signed-off-by: Gazal K --- stable/cluster-autoscaler/Chart.yaml | 2 +- stable/cluster-autoscaler/templates/_helpers.tpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/stable/cluster-autoscaler/Chart.yaml b/stable/cluster-autoscaler/Chart.yaml index bf143f641b..549d028512 100644 --- a/stable/cluster-autoscaler/Chart.yaml +++ b/stable/cluster-autoscaler/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 description: Scales worker nodes within autoscaling groups. icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png name: cluster-autoscaler -version: 7.2.1 +version: 7.2.2 appVersion: 1.17.1 home: https://github.com/kubernetes/autoscaler sources: diff --git a/stable/cluster-autoscaler/templates/_helpers.tpl b/stable/cluster-autoscaler/templates/_helpers.tpl index a488bbc072..acd7bab517 100644 --- a/stable/cluster-autoscaler/templates/_helpers.tpl +++ b/stable/cluster-autoscaler/templates/_helpers.tpl @@ -76,9 +76,9 @@ Return the appropriate apiVersion for podsecuritypolicy. Return the service account name used by the pod. */}} {{- define "cluster-autoscaler.serviceAccountName" -}} -{{- if .Values.serviceAccount.create -}} - {{ default (include "cluster-autoscaler.fullname" .) .Values.serviceAccount.name }} +{{- if .Values.rbac.serviceAccount.create -}} + {{ default (include "cluster-autoscaler.fullname" .) .Values.rbac.serviceAccount.name }} {{- else -}} - {{ default "default" .Values.serviceAccount.name }} + {{ default "default" .Values.rbac.serviceAccount.name }} {{- end -}} {{- end -}}