Standardize config.

gitea/db-init-job.yaml

@@ -38,11 +38,11 @@ spec:
                   name: postgres-secrets
                   key: password
             - name: DB_HOSTNAME
-              value: "{{ .dbHost }}"
+              value: "{{ .db.host }}"
             - name: DB_DATABASE_NAME
-              value: "{{ .dbName }}"
+              value: "{{ .db.name }}"
             - name: DB_USERNAME
-              value: "{{ .dbUser }}"
+              value: "{{ .db.user }}"
             - name: DB_PASSWORD
               valueFrom:
                 secretKeyRef:

gitea/deployment.yaml

@@ -23,7 +23,7 @@ spec:
       terminationGracePeriodSeconds: 60
       containers:
         - name: gitea
-          image: "{{ .image }}"
+          image: "gitea/gitea:1.24.3"
           imagePullPolicy: IfNotPresent
           envFrom:
             - configMapRef:

gitea/gitea.env

@@ -8,7 +8,7 @@ GITEA_ADMIN_PASSWORD_MODE=keepUpdated
 
 # Core app settings
 GITEA____APP_NAME={{ .appName }}
-GITEA____RUN_MODE={{ .runMode }}  
+GITEA____RUN_MODE=prod
 GITEA____RUN_USER=git
 
 # Security settings
@@ -17,19 +17,19 @@ GITEA__security__PASSWORD_HASH_ALGO=pbkdf2
 
 # Database settings (except password which comes from secret)
 GITEA__database__DB_TYPE=postgres
-GITEA__database__HOST={{ .dbHost }}:{{ .dbPort }}
-GITEA__database__NAME={{ .dbName }}
-GITEA__database__USER={{ .dbUser }}
+GITEA__database__HOST={{ .db.host }}:{{ .db.port }}
+GITEA__database__NAME={{ .db.name }}
+GITEA__database__USER={{ .db.user }}
 GITEA__database__SSL_MODE=disable
 GITEA__database__LOG_SQL=false
 
 # Server settings
 GITEA__server__DOMAIN={{ .domain }}
-GITEA__server__HTTP_PORT={{ .port }}
+GITEA__server__HTTP_PORT=3000
 GITEA__server__ROOT_URL=https://{{ .domain }}/
 GITEA__server__DISABLE_SSH=false
 GITEA__server__SSH_DOMAIN={{ .domain }}
-GITEA__server__SSH_PORT={{ .sshPort }}
+GITEA__server__SSH_PORT=22
 GITEA__server__SSH_LISTEN_PORT=2222
 GITEA__server__LFS_START_SERVER=true
 GITEA__server__OFFLINE_MODE=true

gitea/manifest.yaml

@@ -1,7 +1,7 @@
 name: gitea
 is: gitea
 description: Gitea is a painless self-hosted Git service written in Go
-version: 1.24.3
+version: 1.24.3-1
 icon: https://cdn.jsdelivr.net/gh/homarr-labs/dashboard-icons/svg/gitea.svg
 requires:
 - name: postgres
@@ -9,21 +9,17 @@ requires:
 defaultConfig:
   namespace: gitea
   externalDnsDomain: '{{ .cloud.domain }}'
-  image: gitea/gitea:1.24.3
   appName: Gitea
   domain: gitea.{{ .cloud.domain }}
   tlsSecretName: wildcard-wild-cloud-tls
-  port: 3000
-  sshPort: 22
   storage: 10Gi
-  dbName: gitea
-  dbUser: gitea
-  dbHost: postgres.postgres.svc.cluster.local
   adminUser: admin
   adminEmail: "{{ .operator.email }}"
-  dbPort: 5432
-  timezone: UTC
-  runMode: prod
+  db:
+    name: gitea
+    user: gitea
+    host: '{{ .apps.postgres.host }}'
+    port: '{{ .apps.postgres.port }}'
   smtp:
     host: '{{ .apps.smtp.host }}'
     port: '{{ .apps.smtp.port }}'

gitea/service.yaml

@@ -8,7 +8,7 @@ spec:
   ports:
   - name: http
     port: 3000
-    targetPort: {{ .port }}
+    targetPort: 3000
   selector:
     component: web
 ---
@@ -21,7 +21,7 @@ spec:
   type: LoadBalancer
   ports:
   - name: ssh
-    port: {{ .sshPort }}
+    port: 22
     targetPort: 2222
     protocol: TCP
   selector: