feat: decouple Gitea from community helm chart (#1595)

Co-authored-by: Jehoszafat Zimnowoda <[email protected]>

Author: CasLubbers

helmfile.d/helmfile-04.databases.yaml

@@ -11,8 +11,6 @@ bases:
 {{- $v := .Values }}
 {{- $a := $v.apps }}
 {{- $h := $a.harbor }}
-{{- $hdb := $v.databases.harbor }}
-{{- $kdb := $v.databases.keycloak }}
 {{- $k := $a.keycloak }}
 
 releases:
@@ -28,3 +26,9 @@ releases:
     labels:
       pkg: keycloak
     <<: *otomiDb
+  - name: gitea-otomi-db
+    installed: {{ or $v.databases.gitea.useOtomiDB  $v.databases.gitea.imported }}
+    namespace: gitea
+    labels:
+      pkg: gitea
+    <<: *otomiDb

helmfile.d/snippets/defaults.yaml

@@ -658,6 +658,19 @@ environments:
             size: '5Gi'
             replicas: 2
             coreDatabase: registry
+          gitea:
+            useOtomiDB: true
+            imported: false
+            size: '5Gi'
+            replicas: 2
+            resources:
+              limits:
+                cpu: 100m
+                memory: 512Mi
+              requests:
+                cpu: 50m
+                memory: 256Mi
+            postgresqlPassword: {{ randAlphaNum 20 }}
         platformBackups:
           database:
             harbor:

upgrades.yaml

@@ -81,3 +81,6 @@ operations:
   - version: 2.10.0
     pre:
       - upgrades/pre/upgrade-2-10-0.sh || true
+  - version: 3.0.0
+    pre:
+      - upgrades/pre/upgrade-3-0-0.sh || true

upgrades/pre/upgrade-3-0-0.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -eu
+
+kubectl annotate -n gitea secret/gitea-postgresql helm.sh/resource-policy='keep' deprecated=true
+kubectl annotate -n gitea sts/gitea-postgresql helm.sh/resource-policy='keep' deprecated=true
+kubectl annotate -n gitea svc/gitea-postgresql helm.sh/resource-policy='keep' deprecated=true

values-changes.yaml

@@ -144,6 +144,9 @@ changes:
       - 'apps.harbor.database.size': 'databases.harbor.size'
       - 'apps.harbor.resources.database': 'databases.harbor.resources'
   - version: 22
+    additions:
+      - databases.gitea.useOtomiDB: false
+      - databases.gitea.imported: false
     deletions:
       - 'apps.thanos'
       - 'apps.prometheus.remoteWrite.otomiThanos'

values-schema.yaml

@@ -3793,7 +3793,22 @@ properties:
           replicas:
             type: integer
             default: 2
-
+      gitea:
+        title: gitea
+        properties:
+          useOtomiDB:
+            type: boolean
+            default: false
+          size:
+            type: string
+          resources:
+            $ref: '#/definitions/resources'
+          replicas:
+            type: integer
+            default: 2
+          imported:
+            type: boolean
+            default: false
   teamConfig:
     additionalProperties: false
     patternProperties:

values/gitea/gitea-otomi-db.gotmpl

@@ -0,0 +1,49 @@
+{{- $v := .Values }}
+{{- $k := $v.apps.gitea }}
+{{- $cnpg := $v.apps.cnpg }}
+{{- $gdb := $v.databases.gitea }}
+
+name: gitea-db
+storage:
+  size: {{ $gdb.size }}
+
+{{- if $gdb.imported }}
+clusterSpec:
+  bootstrap:
+    initdb:
+      database: gitea
+      owner: gitea
+      secret:
+        name: gitea-db-secret
+      import:
+        type: microservice
+        databases:
+          - gitea
+        source:
+          externalCluster: gitea-postgresql
+  externalClusters:
+  - name: gitea-postgresql
+    connectionParameters:
+      host: gitea-postgresql.gitea.svc.cluster.local
+      user: gitea
+      dbname: gitea
+      sslmode: disable
+    password:
+      name: gitea-postgresql
+      key: postgresql-password
+
+{{- else }}
+clusterSpec:  
+  bootstrap:
+    initdb:
+      database: gitea
+      owner: gitea
+      secret:
+        name: gitea-db-secret
+      localeCollate: 'en_US.UTF-8'
+      localeCType: 'en_US.UTF-8'
+{{- end }}
+
+instances: {{ $gdb.replicas }}
+
+resources: {{- toYaml $gdb.resources | nindent 6 }}

values/gitea/gitea-raw.gotmpl

@@ -1,11 +1,19 @@
 {{- $v := .Values }}
 
-{{- if $v._derived.untrustedCA }}
 resources:
+{{- if $v._derived.untrustedCA }}
   - apiVersion: v1
     kind: Secret
     metadata:
       name: custom-ca
     data:
       ca-certificates.crt: {{ .Values._derived.caCert | b64enc }}
-{{- end }}
+{{- end }}
+  - apiVersion: v1
+    kind: Secret
+    type: kubernetes.io/basic-auth
+    metadata:
+      name: gitea-db-secret
+    data:
+      username: "{{ "gitea" | b64enc }}"
+      password: "{{ $v.apps.gitea.postgresqlPassword | b64enc }}"

values/gitea/gitea.gotmpl

@@ -4,6 +4,8 @@
 {{- $k := $v.apps.keycloak }}
 {{- $giteaDomain := printf "gitea.%s" $v.cluster.domainSuffix }}
 {{- $cm := $v.apps | get "cert-manager" }}
+{{- $gdb := $v.databases.gitea }}
+
 nameOverride: gitea
 fullnameOverride: gitea
 
@@ -56,6 +58,15 @@ gitea:
     username: {{ $g.adminUsername }}
     password: {{ $g.adminPassword }}
   config:
+    {{- if $gdb.useOtomiDB }}
+    database:
+      DB_TYPE: postgres
+      HOST: gitea-db-rw.gitea.svc.cluster.local:5432
+      NAME: gitea
+      USER: gitea
+      PASSWD: {{ $v.apps.gitea.postgresqlPassword }}
+      SCHEMA: public
+    {{- end }}
     admin:
       DISABLE_REGULAR_ORG_CREATION: false
     log:
@@ -170,6 +181,11 @@ persistence:
   {{- end }}
 
 postgresql:
+  {{- if $gdb.useOtomiDB }}
+  enabled: false
+  {{- else }}
+  enabled: true
+  {{- end }} 
   # @TODO:
   image:
     tag: {{ $g | get "image.postgresql.tag" "13.5.0" }}