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
|
||||
mergePolicy: Merge
|
||||
data:
|
||||
username: firefly
|
||||
username: '{{ index . "firefly-db-username" }}'
|
||||
DB_PASSWORD: '{{ index . "firefly-db-password" }}'
|
||||
APP_KEY: '{{ index . "firefly-app-key" }}'
|
||||
STATIC_CRON_TOKEN: '{{ index . "firefly-cron-token" }}'
|
||||
|
|
@ -34,3 +34,6 @@ spec:
|
|||
- secretKey: gmail-app-password
|
||||
remoteRef:
|
||||
key: gmail-app-password
|
||||
- secretKey: firefly-db-username
|
||||
remoteRef:
|
||||
key: firefly-db-username
|
||||
|
|
|
|||
|
|
@ -42,8 +42,8 @@ spec:
|
|||
persistentVolumeClaim:
|
||||
claimName: firefly-data
|
||||
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
name: firefly-config
|
||||
- secretRef:
|
||||
name: firefly-secrets
|
||||
#envFrom:
|
||||
# - configMapRef:
|
||||
# name: firefly-config
|
||||
# - secretRef:
|
||||
# name: firefly-secrets
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ spec:
|
|||
- name: PGPASSWORD
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
name: pg-superuser-secret
|
||||
name: pg-cluster-root-password
|
||||
key: password
|
||||
|
||||
- name: APP_DB
|
||||
|
|
|
|||
Loading…
Reference in a new issue