From 73feabe55c99ebf614672c1fb26967533e8282d1 Mon Sep 17 00:00:00 2001
From: Remy Moll <me@moll.re>
Date: Fri, 4 Oct 2024 17:45:47 +0200
Subject: [PATCH] make gitea use cnpg cluster

---
 infrastructure/gitea/gitea.pvc.yaml    | 50 ++-------------------
 infrastructure/gitea/gitea.values.yaml | 62 +++++++++++---------------
 2 files changed, 31 insertions(+), 81 deletions(-)

diff --git a/infrastructure/gitea/gitea.pvc.yaml b/infrastructure/gitea/gitea.pvc.yaml
index 9c35389..262b74e 100644
--- a/infrastructure/gitea/gitea.pvc.yaml
+++ b/infrastructure/gitea/gitea.pvc.yaml
@@ -1,53 +1,11 @@
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: gitea-data-nfs
-spec:
-  capacity:
-    storage: "10Gi"
-  accessModes:
-    - ReadWriteOnce
-  nfs:
-    path: /export/kluster/gitea/data
-    server: 192.168.1.157
----
-apiVersion: v1
 kind: PersistentVolumeClaim
+apiVersion: v1
 metadata:
-  name: gitea-data-nfs
+  name: gitea-data
 spec:
-  storageClassName: ""
+  storageClassName: "nfs-client"
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
-      storage: "10Gi"
-  volumeName: gitea-data-nfs
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: gitea-postgresql-data-nfs
-spec:
-  capacity:
-    storage: "5Gi"
-  accessModes:
-    - ReadWriteOnce
-  nfs:
-    path: /export/kluster/gitea/postgres
-    server: 192.168.1.157
-
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: gitea-postgresql-data-nfs
-spec:
-  storageClassName: ""
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: "5Gi"
-  volumeName: gitea-postgresql-data-nfs
+      storage: 50Gi
diff --git a/infrastructure/gitea/gitea.values.yaml b/infrastructure/gitea/gitea.values.yaml
index 4b84dcf..bb82c9a 100644
--- a/infrastructure/gitea/gitea.values.yaml
+++ b/infrastructure/gitea/gitea.values.yaml
@@ -67,7 +67,7 @@ persistence:
   enabled: true
   create: false
   mount: true
-  claimName: gitea-data-nfs
+  claimName: gitea-data
 
 
 
@@ -115,43 +115,35 @@ gitea:
     indexer:
       ISSUE_INDEXER_TYPE: bleve
       REPO_INDEXER_ENABLED: false
+  
+  additionalConfigSources:
+    - secret:
+      secretName: gitea-oauth
+  # since we want to reuse the posgres secret, we cannot directly use it here, but instead set the ENV variables
+  additionalConfugFromEnvs:
+    - name: GITEA__DATABASE__DB_TYPE
+      value: postgres
+    - name: GITEA__DATABASE__HOST
+      value: gitea-postgres-rw:5432
+    - name: GITEA__DATABASE__NAME
+      valueFrom:
+        secretKeyRef:
+          name: postgres-password
+          key: database
+    - name: GITEA__DATABASE__PASSWD
+      valueFrom:
+        secretKeyRef:
+          name: postgres-password
+          key: password
+    - name: GITEA__DATABASE__USER
+      valueFrom:
+        secretKeyRef:
+          name: postgres-password
+          key: user
 
 
-
-
-## @section PostgreSQL
-#
-## @param postgresql.enabled Enable PostgreSQL
-## @param postgresql.global.postgresql.auth.password Password for the `gitea` user (overrides `auth.password`)
-## @param postgresql.global.postgresql.auth.database Name for a custom database to create (overrides `auth.database`)
-## @param postgresql.global.postgresql.auth.username Name for a custom user to create (overrides `auth.username`)
-## @param postgresql.global.postgresql.service.ports.postgresql PostgreSQL service port (overrides `service.ports.postgresql`)
-## @param postgresql.primary.persistence.size PVC Storage Request for PostgreSQL volume
 postgresql:
-  enabled: true
-  image:
-    tag: 11
-  # diagnosticMode:
-  #   enabled: true
-  containerSecurityContext:
-    runAsUser: 0
-  global:
-    postgresql:
-      auth:
-        password: gitea
-        database: gitea
-        username: gitea
-      service:
-        ports:
-          postgresql: 5432
-  primary:
-    persistence:
-      size: 10Gi
-      existingClaim: gitea-postgresql-data-nfs
-      # mountPath: /bitnami/postgresql/data
-
-
-
+  enabled: false
 redis-cluster:
   enabled: false
 postgresql-ha: