feat(charts/authentik): Support Service accounts for authentik #321
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This will allow the use of container secret intrfaces
ryanfaircloth
changed the title
rissson
requested changes
Jan 27, 2025
Member
rissson
left a comment
rissson
left a comment
There was a problem hiding this comment.
We already support setting a custom service account. As such I'm not inclined to accept this PR.
Comment on lines
+41
to
+55
| {{- if .Values.server.serviceAccount.create }} | ||
| {{- if .Values.server.serviceAccount.name }} | ||
| serviceAccountName: {{ .Values.server.serviceAccount.name }} | ||
| {{- 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 }} |
Member
There was a problem hiding this comment.
This might result in multiple serviceAccountName being set. Also, it removes imagePullSecrets when no service account is set
Comment on lines
+41
to
+52
| {{- 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 }} |
Member
There was a problem hiding this comment.
Same as the server. Also this references server.serviceAccountName although we're templating the worker deployment here
| serviceAccountName: ~ | ||
|
|
||
| serviceAccount: | ||
| create: true |
Member
There was a problem hiding this comment.
This definitely shouldn't be true by default, especially since we're using authentik-remote-cluster by default.
wrenix
suggested changes
Mar 5, 2025
Contributor
wrenix
left a comment
wrenix
left a comment
There was a problem hiding this comment.
Is really hard to read that code.
Comment on lines
+42
to
+43
| {{- if .Values.server.serviceAccount.name }} | ||
| serviceAccountName: {{ .Values.server.serviceAccount.name }} |
Contributor
There was a problem hiding this comment.
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: {{ . }} |
Comment on lines
+19
to
+22
| {{- if .Values.server.serviceAccount.annotations }} | ||
| annotations: | ||
| {{ toYaml .Values.serviceAccount.annotations | indent 4 }} | ||
| {{- end }} |
Contributor
There was a problem hiding this comment.
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 }} |
Contributor
There was a problem hiding this comment.
with is a implizit if -> make that code more readable
Comment on lines
+16
to
+18
| {{- if .Values.server.serviceAccount.labels }} | ||
| {{- toYaml .Values.server.serviceAccount.labels | nindent 4 }} | ||
| {{- end }} |
Contributor
There was a problem hiding this comment.
Suggested change
| {{- if .Values.server.serviceAccount.labels }} | |
| {{- toYaml .Values.server.serviceAccount.labels | nindent 4 }} | |
| {{- end }} | |
| {{- with .Values.server.serviceAccount.labels }} | |
| {{- toYaml . | nindent 4 }} | |
| {{- end }} |
Contributor
There was a problem hiding this comment.
with is a implizit if -> make that code more readable
Comment on lines
+13
to
+22
| {{- 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 }} |
Contributor
There was a problem hiding this comment.
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 }} |
Comment on lines
+5
to
+9
| {{- if .Values.worker.serviceAccount.name }} | ||
| name: {{ .Values.worker.serviceAccount.name }} | ||
| {{- else }} | ||
| name: {{ template "authentik.server.fullname" . }} | ||
| {{- end }} |
Contributor
There was a problem hiding this comment.
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" .) }} |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This will allow the use of container secret intrfaces