From 0702e29cabfe2a4bfbb8f5bfaba4b448a4d82b52 Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Wed, 16 Apr 2025 16:39:19 +0100 Subject: [PATCH] forgejo: Add configuration for crunchydata postgresql db Signed-off-by: David Kirwan --- .../forgejo/templates/postgres-cluster.yaml.j2 | 2 ++ roles/openshift-apps/forgejo/templates/values.yaml.j2 | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/roles/openshift-apps/forgejo/templates/postgres-cluster.yaml.j2 b/roles/openshift-apps/forgejo/templates/postgres-cluster.yaml.j2 index 740fda9d64..5db9ccfbe6 100644 --- a/roles/openshift-apps/forgejo/templates/postgres-cluster.yaml.j2 +++ b/roles/openshift-apps/forgejo/templates/postgres-cluster.yaml.j2 @@ -1,6 +1,8 @@ apiVersion: postgres-operator.crunchydata.com/v1beta1 kind: PostgresCluster metadata: + annotations: + postgres-operator.crunchydata.com/autoCreateUserSchema: "true" name: forgejo-ha namespace: forgejo spec: diff --git a/roles/openshift-apps/forgejo/templates/values.yaml.j2 b/roles/openshift-apps/forgejo/templates/values.yaml.j2 index 8e5ecf5ebb..c358963338 100644 --- a/roles/openshift-apps/forgejo/templates/values.yaml.j2 +++ b/roles/openshift-apps/forgejo/templates/values.yaml.j2 @@ -514,7 +514,15 @@ gitea: OFFLINE_MODE: false ## @param gitea.config.database Database configuration (only necessary with an [externally managed DB](https://code.forgejo.org/forgejo-helm/forgejo-helm#external-database)). - database: {} + database: + HOST: "{{ forgejo_database_host }}" + NAME: "{{ forgejo_database_name }}" + USER: "{{ forgejo_database_user }}" + PASSWD: "{{ forgejo_database_password }}" + SCHEMA: "{{ forgejo_database_schema }}" + SSL_MODE: "require" + DB_TYPE: "postgres" + ## @param gitea.config.indexer Settings for what content is indexed and how indexer: {}