more work on getting pg superuser secret working
This commit is contained in:
parent
4ff30eff67
commit
417c1ea770
|
|
@ -1,17 +0,0 @@
|
||||||
apiVersion: postgresql.cnpg.io/v1
|
|
||||||
kind: Cluster
|
|
||||||
metadata:
|
|
||||||
name: firefly-db
|
|
||||||
namespace: firefly
|
|
||||||
spec:
|
|
||||||
instances: 3
|
|
||||||
|
|
||||||
storage:
|
|
||||||
size: 10Gi
|
|
||||||
|
|
||||||
bootstrap:
|
|
||||||
initdb:
|
|
||||||
database: firefly
|
|
||||||
owner: firefly
|
|
||||||
secret:
|
|
||||||
name: firefly-secrets
|
|
||||||
|
|
@ -16,7 +16,7 @@ spec:
|
||||||
engineVersion: v2
|
engineVersion: v2
|
||||||
mergePolicy: Merge
|
mergePolicy: Merge
|
||||||
data:
|
data:
|
||||||
username: firefly
|
username: '{{ index . "firefly-db-username" }}'
|
||||||
DB_PASSWORD: '{{ index . "firefly-db-password" }}'
|
DB_PASSWORD: '{{ index . "firefly-db-password" }}'
|
||||||
APP_KEY: '{{ index . "firefly-app-key" }}'
|
APP_KEY: '{{ index . "firefly-app-key" }}'
|
||||||
STATIC_CRON_TOKEN: '{{ index . "firefly-cron-token" }}'
|
STATIC_CRON_TOKEN: '{{ index . "firefly-cron-token" }}'
|
||||||
|
|
@ -34,3 +34,6 @@ spec:
|
||||||
- secretKey: gmail-app-password
|
- secretKey: gmail-app-password
|
||||||
remoteRef:
|
remoteRef:
|
||||||
key: gmail-app-password
|
key: gmail-app-password
|
||||||
|
- secretKey: firefly-db-username
|
||||||
|
remoteRef:
|
||||||
|
key: firefly-db-username
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,8 @@ spec:
|
||||||
persistentVolumeClaim:
|
persistentVolumeClaim:
|
||||||
claimName: firefly-data
|
claimName: firefly-data
|
||||||
|
|
||||||
envFrom:
|
#envFrom:
|
||||||
- configMapRef:
|
# - configMapRef:
|
||||||
name: firefly-config
|
# name: firefly-config
|
||||||
- secretRef:
|
# - secretRef:
|
||||||
name: firefly-secrets
|
# name: firefly-secrets
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ spec:
|
||||||
- name: PGPASSWORD
|
- name: PGPASSWORD
|
||||||
valueFrom:
|
valueFrom:
|
||||||
secretKeyRef:
|
secretKeyRef:
|
||||||
name: pg-superuser-secret
|
name: pg-cluster-root-password
|
||||||
key: password
|
key: password
|
||||||
|
|
||||||
- name: APP_DB
|
- name: APP_DB
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue