PgBouncer: use service FQDN (#635)

Author: guidoiaquinti

charts/posthog/templates/_pgbouncer.tpl

@@ -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

charts/posthog/templates/_snippet-initContainers-wait-for-service-dependencies.tpl

@@ -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

charts/posthog/values.yaml

@@ -2579,3 +2579,7 @@ busybox:
   ##   - myRegistryKeySecretName
   ##
   pullSecrets: []
+
+
+# -- Kubernetes cluster domain name
+clusterDomain: cluster.local