fix serviceAccount name when release name does not contain authentik (#…

…183) * fix serviceAccount name when release name does not contain authentik * bump chart version
goauthentik · Jul 7, 2023 · 4af849b · 4af849b
1 parent 69aef87
commit 4af849b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/charts/authentik/Chart.yaml b/charts/authentik/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-version: 2023.6.0
+version: 2023.6.1
 appVersion: 2023.6.0
 name: authentik
 description: authentik is an open-source Identity Provider focused on flexibility and versatility

diff --git a/charts/authentik/README.md b/charts/authentik/README.md
@@ -6,7 +6,7 @@
 
 [![Join Discord](https://img.shields.io/discord/809154715984199690?label=Discord&style=for-the-badge)](https://goauthentik.io/discord)
 [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/goauthentik/helm/lint-test.yaml?branch=main&label=ci&style=for-the-badge)](https://github.com/goauthentik/helm/actions/workflows/lint-test.yaml)
-![Version: 2023.6.0](https://img.shields.io/badge/Version-2023.6.0-informational?style=for-the-badge)
+![Version: 2023.6.1](https://img.shields.io/badge/Version-2023.6.1-informational?style=for-the-badge)
 ![AppVersion: 2023.6.0](https://img.shields.io/badge/AppVersion-2023.6.0-informational?style=for-the-badge)
 
 authentik is an open-source Identity Provider focused on flexibility and versatility

diff --git a/charts/authentik/README.md.gotmpl b/charts/authentik/README.md.gotmpl
@@ -6,7 +6,7 @@
 
 [![Join Discord](https://img.shields.io/discord/809154715984199690?label=Discord&style=for-the-badge)](https://goauthentik.io/discord)
 [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/goauthentik/helm/lint-test.yaml?branch=main&label=ci&style=for-the-badge)](https://github.com/goauthentik/helm/actions/workflows/lint-test.yaml)
-![Version: 2023.6.0](https://img.shields.io/badge/Version-2023.6.0-informational?style=for-the-badge)
+![Version: 2023.6.1](https://img.shields.io/badge/Version-2023.6.1-informational?style=for-the-badge)
 ![AppVersion: 2023.6.0](https://img.shields.io/badge/AppVersion-2023.6.0-informational?style=for-the-badge)
 
 {{ template "chart.deprecationWarning" . }}

diff --git a/charts/authentik/templates/worker-deployment.yaml b/charts/authentik/templates/worker-deployment.yaml
@@ -35,7 +35,7 @@ spec:
         {{- toYaml $.Values.image.pullSecrets | nindent 8 }}
       {{- end }}
       {{- if $.Values.serviceAccount.create }}
-      serviceAccountName: {{ include "authentik.names.fullname" $ }}
+      serviceAccountName: {{ include "authentik-remote-cluster.fullname" .Subcharts.serviceAccount }}
       {{- end }}
       {{- with $.Values.affinity }}
       affinity:

diff --git a/charts/authentik/values.yaml b/charts/authentik/values.yaml
@@ -200,6 +200,8 @@ serviceAccount:
     # -- As we use the authentik-remote-cluster chart as subchart, and that chart
     # creates a service account secret by default which we don't need here, disable its creation
     enabled: false
+  fullnameOverride: authentik
+  nameOverride: authentik
 
 prometheus:
   serviceMonitor: