From 0b23d53f10e2268b42e15538dae9e97b1c1121b8 Mon Sep 17 00:00:00 2001
From: Nikolai Rodionov <allanger@zohomail.com>
Date: Sat, 29 Jul 2023 22:17:42 +0200
Subject: [PATCH] chore(gitea): Upgrade the gitea chart version

The maintainer of the chart release a breaking chage, so this migration
was not easy. After the upgrade, I've copied all the data from the
previous installation, because the ReplicaSet provided was switched
from the StatefulSet to Deployment.

Issue: https://git.badhouseplants.net/badhouseplants/k8s-cluster-config/issues/86
---
 badhouseplants/values/values.gitea.yaml | 67 +++++++++++++------------
 releases.yaml                           |  4 +-
 2 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/badhouseplants/values/values.gitea.yaml b/badhouseplants/values/values.gitea.yaml
index fa9b60e..7fed6e9 100644
--- a/badhouseplants/values/values.gitea.yaml
+++ b/badhouseplants/values/values.gitea.yaml
@@ -19,12 +19,17 @@ istio:
       port_match: 22
       service: gitea-ssh
       port: 22
-
+# ------------------------------------------
+# -- Database extension is used to manage
+# --  database with db-operator
+# ------------------------------------------
 ext-database:
   enabled: true
   name: gitea-postgres
   instance: postgres
-
+# ------------------------------------------
+# -- Kubernetes related values
+# ------------------------------------------
 replicaCount: 1
 clusterDomain: cluster.local
 
@@ -38,39 +43,20 @@ resources:
 
 persistence:
   enabled: true
-  size: 10Gi
+  size: 6Gi
   accessModes:
     - ReadWriteOnce
-  labels: {}
-  annotations: {}
-
-memcached:
-  enabled: true
-  service:
-    port: 11211
-  resources:
-    requests:
-      cpu: 10m
-postgresql:
-  auth:
-    postgresPassword: check
-  enabled: false
-  global:
-    postgresql:
-      servicePort: 5432
-  persistence:
-    size: 10Gi
-  resources:
-    requests:
-      cpu: 50m
 
 ingress:
   enabled: false
-
+# ------------------------------------------
+# -- Main Gitea settings
+# ------------------------------------------
 gitea:
   metrics:
     enabled: true
     serviceMonitor:
+    # -- TODO(@allanger): Enable it once prometheus is configured
       enabled: false
   config:
     database:
@@ -82,7 +68,7 @@ gitea:
     ui:
       meta:
         AUTHOR: Bad Houseplants
-        DESCRIPTION: by allanger
+        DESCRIPTION: ...by allanger
     repository:
       DEFAULT_BRANCH: main
       MAX_CREATION_LIMIT: 0
@@ -94,6 +80,7 @@ gitea:
       ROOT_URL: https://git.badhouseplants.net
       LFS_START_SERVER: true
       LANDING_PAGE: explore
+      START_SSH_SERVER: true
     admin:
       DISABLE_REGULAR_ORG_CREATION: true
     packages:
@@ -107,14 +94,28 @@ gitea:
     oauth2_client:
       REGISTER_EMAIL_CONFIRM: false
       ENABLE_AUTO_REGISTRATION: true
-statefulset:
-  env:
-    - name: DOMAIN
-      value: git.badhouseplants.net
-    - name: START_SSH_SERVER
-      value: "true"
+    # --------------------------------------
+    # -- Redis settings
+    # --------------------------------------
+    session:
+      PROVIDER: redis
+      PROVIDER_CONFIG: redis://:gtCkXoSg82Aeimj5WYYX@redis-master.database-service.svc.cluster.local:6379/2?pool_size=100&idle_timeout=180s&
+    cache:
+      ENABLED: true
+      ADAPTER: redis
+      HOST: redis://:gtCkXoSg82Aeimj5WYYX@redis-master.database-service.svc.cluster.local:6379/2?pool_size=100&idle_timeout=180s&
+    queue:
+      TYPE: redis
+      CONN_STR: redis://:gtCkXoSg82Aeimj5WYYX@redis-master.database-service.svc.cluster.local:6379/2?pool_size=100&idle_timeout=180s&
 service:
   ssh:
     type: ClusterIP
     port: 22
     clusterIP:
+# ------------------------------------------
+# -- Disabled dependencies
+# ------------------------------------------
+postgresql-ha:
+  enabled: false
+redis-cluster:
+  enabled: false
\ No newline at end of file
diff --git a/releases.yaml b/releases.yaml
index 116503f..5a9b582 100644
--- a/releases.yaml
+++ b/releases.yaml
@@ -242,7 +242,7 @@ templates:
   gitea: &gitea
     name: gitea
     chart: gitea/gitea
-    version: 8.3.0
+    version: 9.0.4
     inherit:
       - template: default-env-values
       - template: default-env-secrets
@@ -305,4 +305,4 @@ templates:
     version: 1.4.2
     inherit:
       - template: default-env-values
-      - template: default-env-secrets
\ No newline at end of file
+      - template: default-env-secrets