Skip to content

Add support for OIDC client secret from existing secret #225

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
shaman007 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add support for OIDC client secret from existing secret #225

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cba02e7
Add support for OIDC client secret from existing secret
shaman007 Dec 6, 2025
07e93eb
Merge branch 'main' into oicdsec
shaman007 Dec 9, 2025
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
11 changes: 11 additions & 0 deletions templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,17 @@ Get the mastodon secret.
{{- end -}}
{{- end -}}

{{/*
Get the oidc secret.
*/}}
{{- define "externalAuth.secretName" -}}
{{- if .Values.externalAuth.oidc.existingSecret }}
{{- printf "%s" (tpl .Values.externalAuth.oidc.existingSecret $) -}}
{{- else -}}
{{- printf "%s-oidc" (include "mastodon.fullname" .) -}}
{{- end -}}
{{- end -}}

{{/*
Get the smtp secrets.
*/}}
Expand Down
4 changes: 3 additions & 1 deletion templates/configmap-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,9 +204,11 @@ data:
OIDC_SCOPE: {{ .Values.externalAuth.oidc.scope | quote }}
OIDC_UID_FIELD: {{ .Values.externalAuth.oidc.uid_field }}
OIDC_CLIENT_ID: {{ .Values.externalAuth.oidc.client_id | quote }}
OIDC_CLIENT_SECRET: {{ .Values.externalAuth.oidc.client_secret }}
OIDC_REDIRECT_URI: {{ .Values.externalAuth.oidc.redirect_uri }}
OIDC_SECURITY_ASSUME_EMAIL_IS_VERIFIED: {{ .Values.externalAuth.oidc.assume_email_is_verified | quote }}
{{- if and .Values.externalAuth.oidc.client_secret (not .Values.externalAuth.oidc.existingSecret) }}
OIDC_CLIENT_SECRET: {{ .Values.externalAuth.oidc.client_secret | quote }}
{{- end }}
{{- with .Values.externalAuth.oidc.client_auth_method }}
OIDC_CLIENT_AUTH_METHOD: {{ . }}
{{- end }}
Expand Down
14 changes: 14 additions & 0 deletions templates/deployment-web.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,20 @@ spec:
secretKeyRef:
name: {{ template "mastodon.postgresql.secretName" . }}
key: password
{{- with .Values.externalAuth.oidc }}
{{- if .enabled }}
{{- if .existingSecret }}
- name: OIDC_CLIENT_SECRET
valueFrom:
secretKeyRef:
name: {{ .existingSecret | quote }}
key: OIDC_CLIENT_SECRET
{{- else if .client_secret }}
- name: OIDC_CLIENT_SECRET
value: {{ .client_secret | quote }}
{{- end }}
{{- end }}
{{- end }}
{{- if .Values.postgresql.readReplica.auth.existingSecret }}
- name: "REPLICA_DB_PASS"
valueFrom:
Expand Down