fix

apps/gitea/index.yaml

@@ -9,85 +9,30 @@ metadata:
     A painless self-hosted Git service.
     Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.
 options:
-  volume:
+  admin:
     default:
-      size: 10Gi
+      email: git-admin@git.your_company.com
+      name: gitea_admin
     examples:
-    - size: 10Gi
+    - email: git-admin@git.your_company.com
+      name: gitea_admin
     properties:
-      size:
-        default: 10Gi
+      email:
+        default: git-admin@git.your_company.com
+        type: string
+      name:
+        default: gitea_admin
         type: string
     type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  load-balancer:
-    default:
-      ip: ''
-    examples:
-    - ip: ''
-    properties:
-      ip:
-        default: ''
-        type: string
-    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  disable-registration:
-    default: true
-    examples:
-    - true
-    type: boolean
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  ssh-port:
-    default: 2222
-    examples:
-    - 2222
-    type: integer
-  default-branch:
-    default: main
-    examples:
-    - main
-    type: string
-  webhook:
-    default:
-      allowed-hosts: private
-      skip-tls-verify: false
-    examples:
-    - allowed-hosts: private
-      skip-tls-verify: false
-    properties:
-      allowed-hosts:
-        default: private
-        type: string
-      skip-tls-verify:
-        default: false
-        type: boolean
-    type: object
-  theme:
-    default: gitea-modern
-    examples:
-    - gitea-modern
-    type: string
   release:
     default: 8.3.0
     examples:
     - 8.3.0
     type: string
-  sub-domain:
-    default: git
+  ingress-class:
+    default: traefik
     examples:
-    - git
+    - traefik
     type: string
   backups:
     default:
@@ -190,51 +135,6 @@ options:
         default: backup-settings
         type: string
     type: object
-  admin:
-    default:
-      email: git-admin@git.your_company.com
-      name: gitea_admin
-    examples:
-    - email: git-admin@git.your_company.com
-      name: gitea_admin
-    properties:
-      email:
-        default: git-admin@git.your_company.com
-        type: string
-      name:
-        default: gitea_admin
-        type: string
-    type: object
-  postgres:
-    default:
-      replicas: 1
-      storage: 10Gi
-      version: '14'
-    examples:
-    - replicas: 1
-      storage: 10Gi
-      version: '14'
-    properties:
-      replicas:
-        default: 1
-        type: integer
-      storage:
-        default: 10Gi
-        type: string
-      version:
-        default: '14'
-        type: string
-    type: object
-  timezone:
-    default: Europe/Paris
-    examples:
-    - Europe/Paris
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
   push-create:
     default:
       org: 'true'
@@ -255,10 +155,65 @@ options:
         default: 'true'
         type: string
     type: object
-  ingress-class:
-    default: traefik
+  webhook:
+    default:
+      allowed-hosts: private
+      skip-tls-verify: false
     examples:
-    - traefik
+    - allowed-hosts: private
+      skip-tls-verify: false
+    properties:
+      allowed-hosts:
+        default: private
+        type: string
+      skip-tls-verify:
+        default: false
+        type: boolean
+    type: object
+  ssh-port:
+    default: 2222
+    examples:
+    - 2222
+    type: integer
+  timezone:
+    default: Europe/Paris
+    examples:
+    - Europe/Paris
+    type: string
+  volume:
+    default:
+      size: 10Gi
+    examples:
+    - size: 10Gi
+    properties:
+      size:
+        default: 10Gi
+        type: string
+    type: object
+  load-balancer:
+    default:
+      ip: ''
+    examples:
+    - ip: ''
+    properties:
+      ip:
+        default: ''
+        type: string
+    type: object
+  sub-domain:
+    default: git
+    examples:
+    - git
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  theme:
+    default: gitea-modern
+    examples:
+    - gitea-modern
     type: string
   images:
     default:
@@ -323,6 +278,51 @@ options:
             type: string
         type: object
     type: object
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  default-branch:
+    default: main
+    examples:
+    - main
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  disable-registration:
+    default: true
+    examples:
+    - true
+    type: boolean
+  postgres:
+    default:
+      replicas: 1
+      storage: 10Gi
+      version: '14'
+    examples:
+    - replicas: 1
+      storage: 10Gi
+      version: '14'
+    properties:
+      replicas:
+        default: 1
+        type: integer
+      storage:
+        default: 10Gi
+        type: string
+      version:
+        default: '14'
+        type: string
+    type: object
 dependencies:
 - dist: null
   category: share

apps/gitea/postgresql.tf

@@ -2,23 +2,6 @@ locals {
   pg-labels = merge(local.common-labels, {
     "app.kubernetes.io/component" = "pg"
   })
-  backup-def = {
-    retentionPolicy = var.backups.retention.db
-    barmanObjectStore = {
-      destinationPath = "s3://${var.instance}-${var.namespace}/"
-      endpointURL = "${var.backups.endpoint}/barman"
-      s3Credentials = {
-        accessKeyId = {
-          name = var.backups.secret-name
-          key = var.backups.key-id-key
-        }
-        secretAccessKey = {
-          name = var.backups.secret-name
-          key = var.backups.secret-key
-        }
-      }
-    }
-  }
 }
 
 resource "kubectl_manifest" "prj_pg" {
@@ -33,17 +16,28 @@ resource "kubectl_manifest" "prj_pg" {
       instances: ${var.postgres.replicas}
       storage:
         size: "${var.postgres.storage}"
-      monitoring:
-        enablePodMonitor: true
       bootstrap:
         initdb:
           database: "${var.component}"
           owner: "${var.component}"
-      backup: ${jsonencode(var.backups.enable?local.backup-def:{})}
+      monitoring:
+        enablePodMonitor: true
+      backup:
+        barmanObjectStore:
+          destinationPath: "s3://${var.instance}-${var.namespace}/"
+          endpointURL: "${var.backups.endpoint}/barman"
+          s3Credentials:
+            accessKeyId:
+              name: "${var.backups.secret-name}"
+              key: "${var.backups.key-id-key}"
+            secretAccessKey:
+              name: "${var.backups.secret-name}"
+              key: "${var.backups.secret-key}"
   EOF
 }
 
 resource "kubectl_manifest" "prj_pg_backup" {
+  count = var.backup.enable ? 1:0
   yaml_body  = <<-EOF
     apiVersion: postgresql.cnpg.io/v1
     kind: ScheduledBackup