Merge 09e99edec4 into d96bbaf42c

dev/helm/templates/deployment.yaml

@@ -56,6 +56,14 @@ spec:
               value: {{ .Values.externalPostgresql.databaseURL }}
             - name: NODE_TLS_REJECT_UNAUTHORIZED
               value: {{ default "1" .Values.externalPostgresql.NODE_TLS_REJECT_UNAUTHORIZED | quote }}
+            {{- else if and (.Values.externalPostgresql).existsSecret (.Values.externalPostgresql).existsSecretKeyName }}
+            - name: DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .Values.externalPostgresql.existsSecret }}
+                  key: {{ .Values.externalPostgresql.existsSecretKeyName }}
+            - name: NODE_TLS_REJECT_UNAUTHORIZED
+              value: {{ default "1" .Values.externalPostgresql.NODE_TLS_REJECT_UNAUTHORIZED | quote }}
             {{- else }}
             - name: DB_HOST
               value: {{ template "wiki.postgresql.host" . }}

dev/helm/values.yaml

@@ -142,6 +142,11 @@ sideload:
 # externalPostgresql:
 #   # note: ?sslmode=require => ?ssl=true
 #   databaseURL: postgresql://postgres:postgres@postgres:5432/wiki?ssl=true
+#   # Exists secret which will be used for fetching database connection URL.
+#   existsSecret: wiki-database-secret
+#   # Used key in the secret.
+#   # Value in that key should be like in `externalPostgresql.databaseURL`.
+#   existsSecretKeyName: connection-url
 #   # For self signed CAs, like DigitalOcean
 #   NODE_TLS_REJECT_UNAUTHORIZED: "0"