Skip to content

feat: add valueFrom option to auth.secret #9932

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
wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −2
Open

feat: add valueFrom option to auth.secret #9932

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
4 changes: 4 additions & 0 deletions helm/templates/phoenix/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,13 @@ spec:
{{- range $authSecrets := .Values.auth.secret }}
- name: {{ $authSecrets.key }}
valueFrom:
{{- if $authSecrets.valueFrom }}
{{- $authSecrets.valueFrom | toYaml | nindent 16 }}
Copy link

Choose a reason for hiding this comment

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

Bug: YAML Indentation Error in valueFrom Content

The nindent 16 for valueFrom content produces malformed YAML. This misaligns the content, preventing proper nesting under valueFrom and differing from the secretKeyRef block's indentation.

Fix in Cursor Fix in Web

{{- else }}
secretKeyRef:
name: {{ $.Values.auth.name }}
key: {{ $authSecrets.key }}
{{- end }}
{{- end }}
{{- end }}
{{- if and .Values.auth.oauth2.enabled .Values.auth.oauth2.providers }}
Expand Down
4 changes: 2 additions & 2 deletions helm/templates/phoenix/secret.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ type: Opaque
data:
{{- if .Values.auth.secret }}
{{- range $authSecrets := .Values.auth.secret }}
{{- if eq $authSecrets.key "PHOENIX_DEFAULT_ADMIN_INITIAL_PASSWORD" }}
{{- if and (eq $authSecrets.key "PHOENIX_DEFAULT_ADMIN_INITIAL_PASSWORD") (not $authSecrets.valueFrom) }}
{{ $authSecrets.key }}: {{ (empty $authSecrets.value | ternary $.Values.auth.defaultAdminPassword $authSecrets.value) | b64enc }}
{{- else }}
{{- else if not $authSecrets.valueFrom }}
{{ $authSecrets.key }}: {{ $authSecrets.value | default (randAlphaNum 32) | b64enc }}
{{- end }}
{{- end }}
Expand Down
7 changes: 7 additions & 0 deletions helm/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,11 @@ auth:
- key: "PHOENIX_SECRET"
# -- Autogenerated if empty
value: ""
# -- Use this for existing Secrets / Configmaps, takes precedence over auth.secret[].value
# valueFrom:
# secretKeyRef:
# name: my-secret
# key: phoenix-secret-key

# -- Environment variable name for the admin secret key
- key: "PHOENIX_ADMIN_SECRET"
Expand Down Expand Up @@ -366,6 +371,8 @@ auth:
# -- List of OAuth2 identity providers to configure
# Each provider requires client_id, client_secret, and oidc_config_url
# Optional settings include display_name, allow_sign_up, and auto_login
# You can also define corresponding ENVs via auth.secrets[].valueFrom to use existing secrets
# ENVs: PHOENIX_OAUTH2_{{ $provider_upper }}_{{ setting }}, e.g. PHOENIX_OAUTH2_GOOGLE_CLIENT_SECRET
providers:
# Example Google configuration:
# google:
Expand Down
Loading