Merge pull request #135 from MediaMarktSaturn/blenkjon/more-automount

Automount Service Account token if a role binding is defined for podT…
MediaMarktSaturn · Jul 19, 2024 · 12c1487 · 12c1487
2 parents 395a629 + 68f09c6
commit 12c1487
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/application/Chart.yaml b/charts/application/Chart.yaml
@@ -7,4 +7,4 @@ maintainers:
   - name: MediaMarktSaturn
     url: https://github.com/MediaMarktSaturn
 appVersion: 1.0.0
-version: 1.20.0
+version: 1.20.1
diff --git a/charts/application/README.md b/charts/application/README.md
@@ -1,6 +1,6 @@
 # application
 
-![Version: 1.20.0](https://img.shields.io/badge/Version-1.20.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
+![Version: 1.21.0](https://img.shields.io/badge/Version-1.21.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 1.0.0](https://img.shields.io/badge/AppVersion-1.0.0-informational?style=flat-square)
 
 Generic application chart with common requirements of a typical workload.
 

diff --git a/charts/application/templates/_podTemplate.tpl b/charts/application/templates/_podTemplate.tpl
@@ -33,7 +33,7 @@ spec:
     {{- range $k, $v := .Values.nodeSelector }}
     {{ $k }}: {{ $v | quote }}
     {{- end }}
-  automountServiceAccountToken: {{ or .Values.serviceAccount.automountServiceAccountToken .Values.istio.enabled .Values.linkerd.enabled }} # 'true' if explictly set or required for side-car injection
+  automountServiceAccountToken: {{ or .Values.serviceAccount.automountServiceAccountToken .Values.istio.enabled .Values.linkerd.enabled (not (empty .Values.serviceAccount.rbac))}} # 'true' if explictly set or required for side-car injection
   {{- if .Values.hostAliases }}
   hostAliases:
   {{- range $ip, $hostList := .Values.hostAliases }}