add port and host to database env
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
apiVersion: v2
|
apiVersion: v2
|
||||||
name: outline
|
name: outline
|
||||||
version: 0.0.9
|
version: 0.1.0
|
||||||
description: Chart for Outline wiki
|
description: Chart for Outline wiki
|
||||||
keywords:
|
keywords:
|
||||||
- wiki
|
- wiki
|
||||||
|
@@ -51,16 +51,16 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: "{{ .Values.outline.utilsSecret.existingSecretName }}"
|
name: "{{ .Values.outline.utilsSecret.existingSecretName }}"
|
||||||
key: "{{ .Values.outline.secretKey.existingSecretKey }}"
|
key: "{{ .Values.outline.secretKey.existingSecretKey }}"
|
||||||
|
- name: POSTGRES_USERNAME
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: "{{ .Values.outline.database.usernameSecret.existingSecretName }}"
|
||||||
|
key: "{{ .Values.outline.database.usernameSecret.existingSecretKey }}"
|
||||||
- name: POSTGRES_PASSWORD
|
- name: POSTGRES_PASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: "{{ .Values.outline.database.passwordSecret.existingSecretName }}"
|
name: "{{ .Values.outline.database.passwordSecret.existingSecretName }}"
|
||||||
key: "{{ .Values.outline.database.passwordSecret.existingSecretKey }}"
|
key: "{{ .Values.outline.database.passwordSecret.existingSecretKey }}"
|
||||||
- name: POSTGRES_USERNAME
|
|
||||||
valueFrom:
|
|
||||||
secretKeyRef:
|
|
||||||
name: "{{ .Values.outline.database.usernameSecret.existingSecretName }}"
|
|
||||||
key: "{{ .Values.outline.database.usernameSecret.existingSecretKey }}"
|
|
||||||
- name: POSTGRES_DATABASE_NAME
|
- name: POSTGRES_DATABASE_NAME
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
@@ -71,10 +71,15 @@ spec:
|
|||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: "{{ .Values.outline.database.databaseHost.existingSecretName }}"
|
name: "{{ .Values.outline.database.databaseHost.existingSecretName }}"
|
||||||
key: "{{ .Values.outline.database.databaseHost.existingSecretKey }}"
|
key: "{{ .Values.outline.database.databaseHost.existingSecretKey }}"
|
||||||
|
- name: POSTGRES_DATABASE_PORT
|
||||||
|
valueFrom:
|
||||||
|
secretKeyRef:
|
||||||
|
name: "{{ .Values.outline.database.databasePort.existingSecretName }}"
|
||||||
|
key: "{{ .Values.outline.database.databasePort.existingSecretKey }}"
|
||||||
- name: DATABASE_URL
|
- name: DATABASE_URL
|
||||||
value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@postgresql-{{ .Release.Name }}-cluster-rw:5432/$(POSTGRES_DATABASE_NAME)"
|
value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_DATABASE_HOST):$(POSTGRES_DATABASE_PORT)/$(POSTGRES_DATABASE_NAME)"
|
||||||
- name: DATABASE_URL_TEST
|
- name: DATABASE_URL_TEST
|
||||||
value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@postgresql-{{ .Release.Name }}-cluster-rw:5432/$(POSTGRES_DATABASE_NAME)-test"
|
value: "postgres://$(POSTGRES_USERNAME):$(POSTGRES_PASSWORD)@$(POSTGRES_DATABASE_HOST):$(POSTGRES_DATABASE_PORT)/$(POSTGRES_DATABASE_NAME)-test"
|
||||||
- name: DATABASE_CONNECTION_POOL_MIN
|
- name: DATABASE_CONNECTION_POOL_MIN
|
||||||
value: "{{ .Values.outline.database.connectionPoolMin }}"
|
value: "{{ .Values.outline.database.connectionPoolMin }}"
|
||||||
- name: DATABASE_CONNECTION_POOL_MAX
|
- name: DATABASE_CONNECTION_POOL_MAX
|
||||||
|
@@ -64,6 +64,9 @@ outline:
|
|||||||
databaseHost:
|
databaseHost:
|
||||||
existingSecretName:
|
existingSecretName:
|
||||||
existingSecretKey:
|
existingSecretKey:
|
||||||
|
databasePort:
|
||||||
|
existingSecretName:
|
||||||
|
existingSecretKey:
|
||||||
connectionPoolMin: ""
|
connectionPoolMin: ""
|
||||||
connectionPoolMax: "20"
|
connectionPoolMax: "20"
|
||||||
sslMode: disable
|
sslMode: disable
|
||||||
|
Reference in New Issue
Block a user