Skip to content

Commit 9261646

Browse files
authored
frontend: specify databaseAuth consistently first in env (#554)
In all places we include the databaseAuth we add it first in the env list, except for the frontend pod. This updates it to be consistently first. Context: For multitenant deployments we want to override the DB user the frontend uses to connect such that it is different to the migrator. This allows us to do that.
1 parent ac68bf6 commit 9261646

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

charts/sourcegraph/templates/frontend/sourcegraph-frontend.Deployment.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,13 +84,13 @@ spec:
8484
imagePullPolicy: {{ .Values.sourcegraph.image.pullPolicy }}
8585
args: {{- default (list "serve") .Values.frontend.args | toYaml | nindent 8 }}
8686
env:
87+
{{- include "sourcegraph.databaseAuth" (list . "pgsql" "PG") | nindent 8 }}
88+
{{- include "sourcegraph.databaseAuth" (list . "codeIntelDB" "CODEINTEL_PG") | nindent 8 }}
89+
{{- include "sourcegraph.databaseAuth" (list . "codeInsightsDB" "CODEINSIGHTS_PG") | nindent 8 }}
8790
{{- range $name, $item := .Values.frontend.env}}
8891
- name: {{ $name }}
8992
{{- $item | toYaml | nindent 10 }}
9093
{{- end }}
91-
{{- include "sourcegraph.databaseAuth" (list . "pgsql" "PG") | nindent 8 }}
92-
{{- include "sourcegraph.databaseAuth" (list . "codeIntelDB" "CODEINTEL_PG") | nindent 8 }}
93-
{{- include "sourcegraph.databaseAuth" (list . "codeInsightsDB" "CODEINSIGHTS_PG") | nindent 8 }}
9494
{{- include "sourcegraph.redisConnection" .| nindent 8 }}
9595
{{- include "sourcegraph.openTelemetryEnv" . | nindent 8 }}
9696
{{- if .Values.blobstore.enabled }}

0 commit comments

Comments
 (0)