Merge pull request #134 from MediaMarktSaturn/blenkjon/automount-serv…

…ice-account-token Automount Service Account token if a role binding is defined
MediaMarktSaturn · Jul 19, 2024 · 395a629 · 395a629
2 parents 2398ad5 + 8798893
commit 395a629
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.19.0
+version: 1.20.0
diff --git a/charts/application/README.md b/charts/application/README.md
@@ -1,6 +1,6 @@
 # application
 
-![Version: 1.19.0](https://img.shields.io/badge/Version-1.19.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.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)
 
 Generic application chart with common requirements of a typical workload.
 

diff --git a/charts/application/templates/k8s-service-account.yaml b/charts/application/templates/k8s-service-account.yaml
@@ -9,4 +9,4 @@ metadata:
   annotations:
     iam.gke.io/gcp-service-account: {{ .Values.serviceAccount.workloadIdentityServiceAccount }}
   {{- end }}
-automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
+automountServiceAccountToken: {{ or .Values.serviceAccount.automountServiceAccountToken (not (empty .Values.serviceAccount.rbac)) }}