Skip to content

Fix sql port in admin tools when not provided #828

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

Merged
robholland merged 6 commits into from
Jan 27, 2026
Merged

Fix sql port in admin tools when not provided #828

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4a50b80
add templates to parse connection addr or get default port
efiShtain Jan 10, 2026
0820871
use template
efiShtain Jan 10, 2026
62bda45
fail template if port isn't provided
efiShtain Jan 15, 2026
11b470f
simplify code
efiShtain Jan 25, 2026
44c1c38
restore helper from upsteram
efiShtain Jan 25, 2026
4b820e0
Merge branch 'temporalio:main' into fix-sql-port-in-admin-tools-when-…
efiShtain Jan 25, 2026
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
2 changes: 1 addition & 1 deletion charts/temporal/templates/_admintools-env.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
- name: SQL_HOST
value: {{ required (printf "Please specify connectAddr for %s store" $store.name) $store.config.connectAddr | splitList ":" | first }}
- name: SQL_PORT
value: {{ required (printf "Please specify connectAddr for %s store" $store.name) $store.config.connectAddr | splitList ":" | last | quote }}
value: {{ include "temporal.sql.portFromConnectAddr" (dict "connectAddr" $store.config.connectAddr "storeName" $store.name) | quote }}
Comment thread
robholland marked this conversation as resolved.
Outdated
- name: SQL_DATABASE
value: {{ required (printf "Please specify databaseName for %s store" $store.name) $store.config.databaseName }}
- name: SQL_USER
Expand Down
16 changes: 16 additions & 0 deletions charts/temporal/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,3 +269,19 @@ To modify camelCase to hyphenated internal-frontend service name
{{- print $service }}
{{- end }}
{{- end -}}

{{/*
Extract port from connectAddr and fail if not provided
Usage: include "temporal.sql.portFromConnectAddr" (dict "connectAddr" .connectAddr "storeName" .storeName)
*/}}
{{- define "temporal.sql.portFromConnectAddr" -}}
{{- $connectAddr := required (printf "Please specify connectAddr for %s store" .storeName) .connectAddr -}}
{{- $parts := splitList ":" $connectAddr -}}
{{- $port := last $parts -}}
{{- if eq $port (first $parts) -}}
{{- required (printf "Port must be specified in connectAddr for %s store. Expected format: 'host:port' (e.g., 'localhost:5432')" .storeName) "" -}}
{{- else -}}
{{- print $port -}}
{{- end -}}
{{- end -}}