migrate funkwhale to a dedicated database

issue: https://git.badhouseplants.net/badhouseplants/k8s-cluster-config/issues/95
This commit is contained in:
RNRod 2023-07-29 18:57:03 +02:00
parent a26d58fb4d
commit 9c33d64c5b
5 changed files with 17 additions and 13 deletions

View File

@ -1,10 +1,7 @@
djangoSecret: ENC[AES256_GCM,data:CxsJVhNxku3pohREaVs=,iv:KDupR8tZlPkPeRwGWzyz+eKtp1tfTdFWqXNuQW20oXo=,tag:lCHqv2CC8cXpnqTr8fGzPg==,type:str] djangoSecret: ENC[AES256_GCM,data:CxsJVhNxku3pohREaVs=,iv:KDupR8tZlPkPeRwGWzyz+eKtp1tfTdFWqXNuQW20oXo=,tag:lCHqv2CC8cXpnqTr8fGzPg==,type:str]
postgresql: postgresql:
auth: auth:
username: ENC[AES256_GCM,data:S09SpdX3ro0S,iv:QYQiF8Ozz9iLElqsoxyika+iVcHzRyo4hhaaIw8/vDM=,tag:KzorD+/Pysqwm5PneRRsyg==,type:str] password: ENC[AES256_GCM,data:IKPFpCY0Im2SQquNFM/3umvGfYOt1A==,iv:asWxkKTvez1FxxXto/ulh4CDBvPZ6SovqKnoFEQjG/s=,tag:iqyxZU+jERNgakMcAm+cnQ==,type:str]
password: ENC[AES256_GCM,data:R6bqME1FH72K,iv:PuOIgStSM/NvwhQj06E/PMtB30aDbstypIBt84Fh1q0=,tag:gzv9S+hYW6qjgdoMhl1mTw==,type:str]
database: ENC[AES256_GCM,data:Ld33SGYZdlK+,iv:hZ/DlO3wNQ7Bm5L3RmNDzOp9U4QBr+nhJbDD1XYc56Y=,tag:NIgpN71+dL1jIgG66l+3VA==,type:str]
postgresPassword: ENC[AES256_GCM,data:AGtLRy+ujNAVpA==,iv:U19Pb6vXU/ceH3M6ZLOduqRBFaStX7JSyFnO6ODzbLs=,tag:kpbEkwMZl7c2wJrELjp4tw==,type:str]
sops: sops:
kms: [] kms: []
gcp_kms: [] gcp_kms: []
@ -20,8 +17,8 @@ sops:
dWdMUFpOOVJYSXdBbzJiSzhQM0VmbWMKUqdIpfa8i7vASIga8HFurrPf1RgA+WVA dWdMUFpOOVJYSXdBbzJiSzhQM0VmbWMKUqdIpfa8i7vASIga8HFurrPf1RgA+WVA
GZiG+M0i4yc3SooTIwbDzH0orfaEHueKdNTGOXMgxNiRIt2q9BG76g== GZiG+M0i4yc3SooTIwbDzH0orfaEHueKdNTGOXMgxNiRIt2q9BG76g==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2023-02-22T09:20:09Z" lastmodified: "2023-07-29T16:49:07Z"
mac: ENC[AES256_GCM,data:1Wt61yiS/8/D0IwiM1RQwV6fYZNq5yZFxOWE/1T4/eLhZY4jSLFMMDrZLA3joOv6ZeN1fWzbJpbGEzsBdPm0ZP7scz56+XwWJTjY9xlnlRB6ou35ViABE9mKCNP6/wUqqnw0d3EhnxhC5lOAPsl5koUHhGQw/8dZEDiA9PniQ20=,iv:dgkvOii83PR3cpFBQoSq9pi53g7DjTcrAXc5O5ge9nA=,tag:/RWIko/vBwFcHIZqmJdrZQ==,type:str] mac: ENC[AES256_GCM,data:Rnkc8vhUyrFUq8BveKpr1PWtZJOaw5862rU/TzvL+X9fkTz4kS2N9wkA1vK21EN0QG4U1kLL3XNImdqK4sw70ItZ+swCUGbqrc2KOFjH3msCIdcCj9xl87cFDMk4OPk2dpzI/ckyXhSco2I6qrW3LvUo60wNNTwEJrUjrUGIx38=,iv:QBFecsw554VtnCbirwPP+HlxPnnpOgwtMWlnmr4IVfo=,tag:ufkQ0lPTkZcTfI7Yrd5Mfw==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.7.3 version: 3.7.3

View File

@ -13,6 +13,11 @@ istio:
service: funkwhale service: funkwhale
port: 80 port: 80
ext-database:
enabled: true
name: funkwhale-postgres
instance: postgres
replicaCount: 1 replicaCount: 1
celery: celery:
worker: worker:
@ -37,7 +42,8 @@ s3:
ingress: ingress:
enabled: false enabled: false
postgresql: postgresql:
primary: enabled: false
resources: host: postgres-postgresql.database-service.svc.cluster.local
requests: auth:
cpu: 50m username: funkwhale-application-funkwhale-postgres
database: funkwhale-application-funkwhale-postgres

View File

@ -20,7 +20,7 @@ istio:
service: gitea-ssh service: gitea-ssh
port: 22 port: 22
database: ext-database:
enabled: true enabled: true
name: gitea-postgres name: gitea-postgres
instance: postgres instance: postgres

View File

@ -1,5 +1,5 @@
--- ---
database: ext-database:
templates: templates:
- | - |
--- ---

View File

@ -76,7 +76,7 @@ templates:
dependencies: dependencies:
- chart: bedag/raw - chart: bedag/raw
version: 2.0.0 version: 2.0.0
alias: database alias: ext-database
values: values:
- '{{ requiredEnv "PWD" }}/common/values.database.yaml' - '{{ requiredEnv "PWD" }}/common/values.database.yaml'
# ---------------------------- # ----------------------------
@ -266,6 +266,7 @@ templates:
- template: default-env-values - template: default-env-values
- template: default-env-secrets - template: default-env-secrets
- template: ext-istio-resource - template: ext-istio-resource
- template: ext-database
mailu: &mailu mailu: &mailu
name: mailu name: mailu