fix(zipline): pgbouncer, rm CNPG stuff

This commit is contained in:
JJGadgets
2023-12-05 23:13:31 +08:00
parent fac61cfb87
commit 0bd2efa5fe
2 changed files with 2 additions and 23 deletions

View File

@@ -38,7 +38,7 @@ spec:
valueFrom:
secretKeyRef:
name: pg-zipline-pguser-zipline
key: uri
key: pgbouncer-uri
# TODO: 2023-06-03 add OAuth when Authentik support is merged: https://github.com/diced/zipline/discussions/321 and https://github.com/diced/zipline/pull/372/
DATASOURCE_S3_ACCESS_KEY_ID:
valueFrom:
@@ -173,11 +173,4 @@ spec:
cpu: 10m
memory: 128Mi
limits:
memory: 6000Mi
# initContainers:
# 01-init-db:
# image: ghcr.io/onedr0p/postgres-init:14.8@sha256:d8391076d2c6449927a6409c4e72aaa5607c95be51969036f4feeb7c999638ea
# imagePullPolicy: IfNotPresent
# envFrom:
# - secretRef:
# name: zipline-pg-superuser
memory: 6000Mi

View File

@@ -7,17 +7,3 @@ metadata:
type: Opaque
stringData:
CORE_SECRET: "${SECRET_ZIPLINE_CORE_SECRET}"
CORE_DATABASE_URL: "postgres://${SECRET_ZIPLINE_PG_USER}:${SECRET_ZIPLINE_PG_PASS}@pg-default-rw.pg.svc.cluster.local:5432/${SECRET_ZIPLINE_PG_DBNAME}"
---
apiVersion: v1
kind: Secret
metadata:
name: "zipline-pg-superuser"
namespace: "zipline"
type: Opaque
stringData:
INIT_POSTGRES_HOST: "pg-default-rw.pg.svc.cluster.local"
INIT_POSTGRES_DBNAME: "${SECRET_ZIPLINE_PG_DBNAME}"
INIT_POSTGRES_USER: "${SECRET_ZIPLINE_PG_USER}"
INIT_POSTGRES_PASS: "${SECRET_ZIPLINE_PG_PASS}"
INIT_POSTGRES_SUPER_PASS: "${SECRET_PG_DEFAULT_SUPER_PASS}"