Skip to content

feat(charts/authentik): Support Service accounts for authentik #321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ryanfaircloth wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(charts/authentik): Support Service accounts for authentik #321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion charts/authentik/templates/server/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,21 @@ spec:
{{- end }}
{{- end }}
spec:
{{- if .Values.server.serviceAccount.create }}
{{- if .Values.server.serviceAccount.name }}
serviceAccountName: {{ .Values.server.serviceAccount.name }}
Comment on lines +42 to +43
Copy link
Contributor

@wrenix wrenix Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with is a implizit if -> make that code more readable

Suggested change
{{- if .Values.server.serviceAccount.name }}
serviceAccountName: {{ .Values.server.serviceAccount.name }}
{{- with .Values.server.serviceAccount.name }}
serviceAccountName: {{ . }}

Copy link
Contributor

@wrenix wrenix Mar 5, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

or better see worker: #321 (comment)

{{- else }}
serviceAccountName: {{ template "authentik.server.fullname" . }}
{{- end }}
{{- else }}
{{- with .Values.server.imagePullSecrets | default .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- end }}
{{- with .Values.server.serviceAccountName }}
serviceAccountName: {{ . }}
{{- end }}
{{- end }}
Comment on lines +41 to +55
Copy link
Member

@rissson rissson Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might result in multiple serviceAccountName being set. Also, it removes imagePullSecrets when no service account is set

{{- with .Values.global.hostAliases }}
hostAliases:
{{- toYaml . | nindent 8 }}
Expand Down
27 changes: 27 additions & 0 deletions charts/authentik/templates/server/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{{- if .Values.server.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
metadata:
{{- if .Values.server.serviceAccount.name }}
name: {{ .Values.server.serviceAccount.name }}
{{- else }}
name: {{ template "authentik.server.fullname" . }}
{{- end }}
namespace: {{ $.Release.Namespace }}
labels:
{{- include "authentik.labels" (dict "context" . "component" .Values.worker.name) | nindent 4 }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.worker.podLabels) }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.server.serviceAccount.labels }}
{{- toYaml .Values.server.serviceAccount.labels | nindent 4 }}
{{- end }}
Comment on lines +16 to +18
Copy link
Contributor

@wrenix wrenix Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{{- if .Values.server.serviceAccount.labels }}
{{- toYaml .Values.server.serviceAccount.labels | nindent 4 }}
{{- end }}
{{- with .Values.server.serviceAccount.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}

Copy link
Contributor

@wrenix wrenix Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with is a implizit if -> make that code more readable

{{- if .Values.server.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
{{- end }}
Comment on lines +19 to +22
Copy link
Contributor

@wrenix wrenix Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
{{- if .Values.server.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
{{- end }}
{{- with .Values.server.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}

Copy link
Contributor

@wrenix wrenix Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

with is a implizit if -> make that code more readable

{{- with .Values.server.imagePullSecrets | default .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 2 }}
{{- end }}
{{- end }}
14 changes: 9 additions & 5 deletions charts/authentik/templates/worker/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,19 @@ spec:
{{- end }}
{{- end }}
spec:
{{- if .Values.worker.serviceAccount.create }}
{{- if .Values.worker.serviceAccount.name }}
serviceAccountName: {{ .Values.worker.serviceAccount.name }}
{{- else }}
serviceAccountName: {{ template "authentik.server.fullname" . }}
{{- end }}
{{- else }}
{{- with .Values.worker.imagePullSecrets | default .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.worker.serviceAccountName }}
{{- end }}
{{- with .Values.server.serviceAccountName }}
Comment on lines +41 to +52
Copy link
Member

@rissson rissson Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as the server. Also this references server.serviceAccountName although we're templating the worker deployment here

serviceAccountName: {{ . }}
{{- else }}
{{- if .Values.serviceAccount.create }}
serviceAccountName: {{ include "authentik-remote-cluster.fullname" .Subcharts.serviceAccount }}
{{- end }}
{{- end }}
{{- with .Values.global.hostAliases }}
Expand Down
27 changes: 27 additions & 0 deletions charts/authentik/templates/worker/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{{- if .Values.worker.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
metadata:
{{- if .Values.worker.serviceAccount.name }}
name: {{ .Values.worker.serviceAccount.name }}
{{- else }}
name: {{ template "authentik.server.fullname" . }}
{{- end }}
Comment on lines +5 to +9
Copy link
Contributor

@wrenix wrenix Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or us with instatt of if

Suggested change
{{- if .Values.worker.serviceAccount.name }}
name: {{ .Values.worker.serviceAccount.name }}
{{- else }}
name: {{ template "authentik.server.fullname" . }}
{{- end }}
name: {{ .Values.worker.serviceAccount.name | default (template "authentik.server.fullname" .) }}

namespace: {{ $.Release.Namespace }}
labels:
{{- include "authentik.labels" (dict "context" . "component" .Values.worker.name) | nindent 4 }}
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.worker.podLabels) }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.worker.serviceAccount.labels }}
{{- toYaml .Values.worker.serviceAccount.labels | nindent 4 }}
{{- end }}
{{- if .Values.worker.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
{{- end }}
Comment on lines +13 to +22
Copy link
Contributor

@wrenix wrenix Mar 5, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

be more consequent with spaces, {{- vs. {{, if vs. with and nindent vs. indent.

Suggested change
{{- with (mergeOverwrite (deepCopy .Values.global.podLabels) .Values.worker.podLabels) }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- if .Values.worker.serviceAccount.labels }}
{{- toYaml .Values.worker.serviceAccount.labels | nindent 4 }}
{{- end }}
{{- if .Values.worker.serviceAccount.annotations }}
annotations:
{{ toYaml .Values.serviceAccount.annotations | indent 4 }}
{{- end }}
{{- with (mergeOverwrite (dict) .Values.global.podLabels) .Values.worker.podLabels) }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.worker.serviceAccount.labels }}
{{- toYaml . | nindent 4 }}
{{- end }}
{{- with .Values.worker.serviceAccount.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}

{{- with .Values.worker.imagePullSecrets | default .Values.global.imagePullSecrets }}
imagePullSecrets:
{{- toYaml . | nindent 2 }}
{{- end }}
{{- end }}
18 changes: 15 additions & 3 deletions charts/authentik/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,15 @@ server:
# -- Alternative DNS policy for authentik server pods
dnsPolicy: ""

# -- serviceAccount to use for authentik server pods
# -- serviceAccount to use for authentik server pods used when serviceAccount.create is false
serviceAccountName: ~

serviceAccount:
create: true
Copy link
Member

@rissson rissson Jan 27, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This definitely shouldn't be true by default, especially since we're using authentik-remote-cluster by default.

# -- serviceAccount name if not provided will be generated using the fullname template
name:
labels: {}
annotations: {}

# -- authentik server pod-level security context
# @default -- `{}` (See [values.yaml])
securityContext: {}
Expand Down Expand Up @@ -757,8 +763,14 @@ worker:
# -- Alternative DNS policy for authentik worker pods
dnsPolicy: ""

# -- serviceAccount to use for authentik worker pods. If set, overrides the value used when serviceAccount.create is true
# -- serviceAccount to use for authentik server pods used when serviceAccount.create is false
serviceAccountName: ~
serviceAccount:
create: true
# -- serviceAccount name if not provided will be generated using the fullname template
name:
labels: {}
annotations: {}

# -- authentik worker pod-level security context
# @default -- `{}` (See [values.yaml])
Expand Down