feat: Add database replica URLs

.github/workflows/lint-test.yaml

@@ -11,14 +11,6 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Envsubst
-        uses: danielr1996/[email protected]
-        env:
-          SLACK_TOKEN: ${{ secrets.SLACK_TOKEN }}
-        with:
-          input: charts/flagsmith/ci/e2e-test-values.yaml
-          output: charts/flagsmith/ci/e2e-test-values.yaml
-
       - name: Set up Helm
         uses: azure/setup-helm@v4
         with:

charts/flagsmith/ci/test-values.yaml

@@ -1,2 +1,24 @@
 tests:
   enabled: true
+
+influxdb2:
+  enabled: false
+
+devPostgresql:
+  enabled: true
+
+databaseExternal:
+  replicas:
+    databases:
+      - url: postgres://user:[email protected]:5432/flagsmith
+
+      - type: postgres
+        host: 127.0.0.1
+        port: 5433
+        database: flagsmith
+        username: user
+        password: password
+
+      - fromExistingSecret:
+          name: test-replica-secret
+          key: database-url

charts/flagsmith/templates/_api_environment.yaml

@@ -10,6 +10,34 @@
       name: {{ template "flagsmith.fullname" . }}
       key: DATABASE_URL
       {{- end }}
+{{/*
+Replica database URLs can be passed in different ways:
+- Plaintext URL
+- Plaintext dictionary config
+- Secret reference
+*/}}
+{{- range $index, $db := .Values.databaseExternal.replicas.databases }}
+- name: REPLICA_DATABASE_URL_{{ $index }}
+  {{- if $db.fromExistingSecret }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ $db.fromExistingSecret.name }}
+      key: {{ $db.fromExistingSecret.key }}
+  {{- else }}
+  value: {{ include "flagsmith.api.formatDatabaseUrl" $db | quote }}
+  {{- end }}
+{{- end }}
+{{- range $index, $db := .Values.databaseExternal.crossRegionReplicas.databases }}
+- name: CROSS_REGION_REPLICA_DATABASE_URL_{{ $index }}
+  {{- if $db.fromExistingSecret }}
+  valueFrom:
+    secretKeyRef:
+      name: {{ $db.fromExistingSecret.name }}
+      key: {{ $db.fromExistingSecret.key }}
+  {{- else }}
+  value: {{ include "flagsmith.api.formatDatabaseUrl" $db | quote }}
+  {{- end }}
+{{- end }}
 - name: DJANGO_SECRET_KEY
   valueFrom:
     secretKeyRef:
@@ -101,10 +129,6 @@
 - name: USE_X_FORWARDED_HOST
   value: 'true'
 {{- end }}
-{{- if and .Values._destructiveTests.enabled .Values._destructiveTests.testToken }}
-- name: E2E_TEST_AUTH_TOKEN
-  value: {{ .Values._destructiveTests.testToken | quote }}
-{{- end }}
 {{- if .Values.api.logging.format }}
 - name: LOG_FORMAT
   value: {{ .Values.api.logging.format }}

charts/flagsmith/templates/_helpers.tpl

@@ -253,16 +253,6 @@ Frontend environment
 - name: FLAGSMITH_PROXY_API_URL
   value: http://{{ include "flagsmith.fullname" . }}-api.{{ .Release.Namespace }}:{{ .Values.service.api.port }}
 {{- end }}
-{{- if and .Values._destructiveTests.enabled .Values._destructiveTests.testToken }}
-- name: E2E_TEST_TOKEN_E2E
-  value: {{ .Values._destructiveTests.testToken | quote }}
-- name: E2E_TEST_TOKEN
-  value: {{ .Values._destructiveTests.testToken | quote }}
-- name: FLAGSMITH_API
-  value: {{ include "flagsmith.fullname" . }}-api.{{ .Release.Namespace }}:{{ .Values.service.api.port }}/api/v1/
-- name: ENABLE_INFLUXDB_FEATURES
-  value: {{ .Values.influxdb2.enabled | ternary "true" "false" | squote }}
-{{- end }}
 {{- range $envName, $envValue := .Values.frontend.extraEnv }}
 - name: {{ $envName }}
   value: {{ $envValue | quote }}
@@ -316,27 +306,6 @@ Database URL for application
 {{- end }}
 {{- end }}
 
-{{/*
-Curl Test container
-*/}}
-{{- define "flagsmith.tests.curlContainer" -}}
-name: {{ .name }}
-image: curlimages/curl
-command: ['curl']
-args:
-  - --fail
-  - --max-time
-  - {{ .maxTime | squote }}
-  - --silent
-{{- if not .printResponseBody }}
-  - --output
-  - /dev/null
-{{- end }}
-  - --write-out
-  - 'URL: %{url_effective}\nHTTP status code: %{http_code}\nBytes downloaded: %{size_download}\nTime taken: %{time_total}s\n'
-  - {{ .url | squote }}
-{{- end }}
-
 {{/*
 Replicas
 */}}
@@ -346,6 +315,27 @@ replicas: {{ . }}
 {{- end }}
 {{- end }}
 
+{{/*
+Determine database URL for direct URL format or component parts
+*/}}
+{{- define "flagsmith.api.formatDatabaseUrl" -}}
+{{- if .url -}}
+  {{- .url -}}
+{{- else -}}
+  {{- $type := .type | default "postgres" -}}
+  {{- $port := .port | default "5432" -}}
+  {{- $password := .password | default "" -}}
+  {{- $username := required "Must specify a database username" .username -}}
+  {{- $host := required "Must specify a database host" .host -}}
+  {{- $database := required "Must specify a database name" .database -}}
+
+  {{- if $password -}}
+    {{- printf "%s://%s:%s@%s:%v/%s" $type $username $password $host $port $database -}}
+  {{- else -}}
+    {{- printf "%s://%s@%s:%v/%s" $type $username $host $port $database -}}
+  {{- end -}}
+{{- end -}}
+{{- end -}}
 
 {{- define "flagsmith.api.secretKeySecretName" -}}
 {{- if .Values.api.secretKeyFromExistingSecret.enabled -}}

charts/flagsmith/templates/tests.yaml

@@ -0,0 +1,54 @@
+{{- if .Values.tests.enabled }}
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: {{ .Release.Name }}-test-serviceaccount
+  labels:
+    {{- include "flagsmith.labels" . | nindent 4 }}
+    app.kubernetes.io/component: test-replica-database-urls
+  annotations:
+    {{- $annotations := include "flagsmith.annotations" .Values.common }}
+    {{- if $annotations }}
+    {{- $annotations | nindent 4 }}
+    {{- end }}
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  name: {{ .Release.Name }}-test-role
+  labels:
+    {{- include "flagsmith.labels" . | nindent 4 }}
+rules:
+  - apiGroups: ["apps"]
+    resources: ["deployments"]
+    verbs: ["get"]
+  - apiGroups: [""]
+    resources: ["pods"]
+    verbs: ["get", "list"]
+  - apiGroups: [""]
+    resources: ["pods/exec"]
+    verbs: ["create"]
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  name: {{ .Release.Name }}-test-rolebinding
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: {{ .Release.Name }}-test-role
+subjects:
+  - kind: ServiceAccount
+    name: {{ .Release.Name }}-test-serviceaccount
+---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-replica-secret
+  labels:
+    app.kubernetes.io/component: test-replica-secret
+type: Opaque
+stringData:
+  database-url: "postgres://user:[email protected]:5434/flagsmith"
+
+{{- end }}

charts/flagsmith/templates/tests/test-replica-database-urls.yaml

@@ -0,0 +1,48 @@
+{{- if and .Values.tests.enabled }}
+apiVersion: v1
+kind: Pod
+metadata:
+  name: {{ template "flagsmith.fullname" . }}-test-replica-database-urls
+  labels:
+    {{- include "flagsmith.labels" . | nindent 4 }}
+    app.kubernetes.io/component: test-replica-database-urls
+  annotations:
+    {{- $annotations := include "flagsmith.annotations" .Values.common }}
+    {{- if $annotations }}
+    {{- $annotations | nindent 4 }}
+    {{- end }}
+    "helm.sh/hook": test
+spec:
+  containers:
+    - name: test-replica-database-urls
+      image: bitnami/kubectl
+      command:
+        - /bin/bash
+        - -c
+        - |
+          set -e
+          set -o pipefail
+
+          expected_replicas=(
+            "postgres://user:[email protected]:5432/flagsmith"
+            "postgres://user:[email protected]:5433/flagsmith"
+            "postgres://user:[email protected]:5434/flagsmith"
+          )
+
+          # Get all environment variables in one command
+          replicas=( $(
+            kubectl exec deploy/{{ template "flagsmith.fullname" . }}-api --\
+            sh -c "echo \$REPLICA_DATABASE_URL_0; echo \$REPLICA_DATABASE_URL_1; echo \$REPLICA_DATABASE_URL_2"
+          ) )
+
+          for i in "${!expected_replicas[@]}"; do
+            echo "REPLICA_DATABASE_URL_$i = ${replicas[$i]}"
+            if [ "${replicas[$i]}" != "${expected_replicas[$i]}" ]; then
+              echo "Replica $i did not match expected value. Expected: ${expected_replicas[$i]}, Got: ${replicas[$i]}"
+              exit 1
+            fi
+          done
+
+  serviceAccountName: {{ .Release.Name }}-test-serviceaccount
+  restartPolicy: Never
+{{- end }}