fix

apps/gitea/index.yaml

@@ -19,71 +19,36 @@ options:
         default: 10Gi
         type: string
     type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  default-branch:
-    default: main
-    examples:
-    - main
-    type: string
-  load-balancer:
+  postgres:
     default:
-      ip: ''
+      replicas: 1
+      storage: 10Gi
+      version: '14'
     examples:
-    - ip: ''
+    - replicas: 1
+      storage: 10Gi
+      version: '14'
     properties:
-      ip:
-        default: ''
+      replicas:
+        default: 1
+        type: integer
+      storage:
+        default: 10Gi
         type: string
-    type: object
-  theme:
-    default: gitea-modern
-    examples:
-    - gitea-modern
-    type: string
-  sub-domain:
-    default: git
-    examples:
-    - git
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
-  webhook:
-    default:
-      allowed-hosts: private
-      skip-tls-verify: false
-    examples:
-    - allowed-hosts: private
-      skip-tls-verify: false
-    properties:
-      allowed-hosts:
-        default: private
+      version:
+        default: '14'
         type: string
-      skip-tls-verify:
-        default: false
-        type: boolean
     type: object
   disable-registration:
     default: true
     examples:
     - true
     type: boolean
-  ssh-port:
-    default: 2222
+  domain:
+    default: your-company
     examples:
-    - 2222
-    type: integer
+    - your-company
+    type: string
   images:
     default:
       gitea:
@@ -147,46 +112,16 @@ options:
             type: string
         type: object
     type: object
-  release:
-    default: 8.3.0
+  sub-domain:
+    default: git
     examples:
-    - 8.3.0
+    - git
     type: string
-  admin:
-    default:
-      email: git-admin@git.your_company.com
-      name: gitea_admin
+  ssh-port:
+    default: 2222
     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
+    - 2222
+    type: integer
   backups:
     default:
       enable: false
@@ -206,6 +141,7 @@ options:
         prune: 10 1 * * 0
       secret-key: s3-secret
       secret-name: backup-settings
+      use-barman: false
     examples:
     - enable: false
       endpoint: ''
@@ -224,6 +160,7 @@ options:
         prune: 10 1 * * 0
       secret-key: s3-secret
       secret-name: backup-settings
+      use-barman: false
     properties:
       enable:
         default: false
@@ -287,6 +224,9 @@ options:
       secret-name:
         default: backup-settings
         type: string
+      use-barman:
+        default: false
+        type: boolean
     type: object
   push-create:
     default:
@@ -308,20 +248,85 @@ options:
         default: 'true'
         type: string
     type: object
-  domain-name:
-    default: your_company.com
+  load-balancer:
+    default:
+      ip: ''
     examples:
-    - your_company.com
+    - ip: ''
+    properties:
+      ip:
+        default: ''
+        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
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
     type: string
   timezone:
     default: Europe/Paris
     examples:
     - Europe/Paris
     type: string
-  domain:
-    default: your-company
+  replicas:
+    default: 1
     examples:
-    - your-company
+    - 1
+    type: integer
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  default-branch:
+    default: main
+    examples:
+    - main
+    type: string
+  release:
+    default: 8.3.0
+    examples:
+    - 8.3.0
+    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
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  theme:
+    default: gitea-modern
+    examples:
+    - gitea-modern
     type: string
 dependencies:
 - dist: null

apps/gitea/postgresql.tf

@@ -5,13 +5,16 @@ locals {
 }
 
 resource "kubectl_manifest" "prj_pg" {
-  yaml_body  = <<-EOF
+  yaml_body  = join("", concat([<<-EOF
     apiVersion: postgresql.cnpg.io/v1
     kind: Cluster
     metadata:
       name: "${var.instance}-${var.component}-pg"
       namespace: "${var.namespace}"
       labels: ${jsonencode(local.pg-labels)}
+      annotations:
+        "k8up.io/backupcommand": "pg_dump -U postgres -d ${var.component} --clean"
+        "k8up.io/file-extension": ".sql"
     spec:
       instances: ${var.postgres.replicas}
       storage:
@@ -22,6 +25,8 @@ resource "kubectl_manifest" "prj_pg" {
           owner: "${var.component}"
       monitoring:
         enablePodMonitor: true
+  EOF
+  ], var.backups.enable&&var.backups.use-barman?[<<-EOF
       backup:
         barmanObjectStore:
           destinationPath: "s3://${var.instance}-${var.namespace}/"
@@ -34,6 +39,7 @@ resource "kubectl_manifest" "prj_pg" {
               name: "${var.backups.secret-name}"
               key: "${var.backups.secret-key}"
   EOF
+  ]:[""]))
 }
 
 resource "kubectl_manifest" "prj_pg_backup" {