Skip to content

PgBouncer: use service FQDN #635

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
merged 1 commit into from
Nov 23, 2022
Merged

PgBouncer: use service FQDN #635

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
17 changes: 14 additions & 3 deletions charts/posthog/templates/_pgbouncer.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,25 @@
{{/* Common pgbouncer helpers used by PostHog */}}
{{/* Common PgBouncer helpers used by PostHog */}}

{{/*
Set pgbouncer host
Set PgBouncer FQDN
*/}}
{{- define "posthog.pgbouncer.fqdn" -}}
{{- $fullname := include "posthog.fullname" . -}}
{{- $serviceName := printf "%s-pgbouncer" $fullname -}}
{{- $releaseNamespace := .Release.Namespace -}}
{{- $clusterDomain := .Values.clusterDomain -}}
{{- printf "%s.%s.svc.%s" $serviceName $releaseNamespace $clusterDomain -}}
{{- end -}}

{{/*
Set PgBouncer host
*/}}
{{- define "posthog.pgbouncer.host" -}}
{{- template "posthog.fullname" . }}-pgbouncer
{{- end -}}

{{/*
Set pgbouncer port
Set PgBouncer port
*/}}
{{- define "posthog.pgbouncer.port" -}}
6543
Expand Down
2 changes: 1 addition & 1 deletion charts/posthog/templates/_snippet-initContainers-wait-for-service-dependencies.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
done
{{ end }}

until (nc -vz "{{ include "posthog.pgbouncer.host" . }}.$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace).svc.cluster.local" {{ include "posthog.pgbouncer.port" . }});
until (nc -vz "{{ include "posthog.pgbouncer.fqdn" . }}" {{ include "posthog.pgbouncer.port" . }});
do
echo "waiting for PgBouncer"; sleep 1;
done
Expand Down
4 changes: 4 additions & 0 deletions charts/posthog/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2579,3 +2579,7 @@ busybox:
## - myRegistryKeySecretName
##
pullSecrets: []


# -- Kubernetes cluster domain name
clusterDomain: cluster.local