fix

apps/dolibarr/index.yaml

@@ -6,15 +6,80 @@ metadata:
   name: dolibarr
   description: null
 options:
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 10Gi
+      type: Filesystem
+    examples:
+    - accessMode: ReadWriteOnce
+      size: 10Gi
+      type: Filesystem
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 10Gi
+        type: string
+      type:
+        default: Filesystem
+        enum:
+        - Filesystem
+        - block
+        type: string
+    type: object
+  parameters:
+    default:
+      MAIN_LANG_DEFAULT: auto
+    examples:
+    - MAIN_LANG_DEFAULT: auto
+    properties:
+      MAIN_LANG_DEFAULT:
+        default: auto
+        type: string
+    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  user-groups:
+    default:
+    - admin: true
+      name: dolibarr-admin
+    examples:
+    - - admin: true
+        name: dolibarr-admin
+    items:
+      properties:
+        admin:
+          type: boolean
+        name:
+          type: string
+      type: object
+    type: array
+  modules:
+    default:
+    - societe
+    examples:
+    - - societe
+    items:
+      type: string
+    type: array
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
-  domain-name:
-    default: your_company.com
+  sub-domain:
+    default: erp
     examples:
-    - your_company.com
+    - erp
     type: string
   resources:
     default:
@@ -57,6 +122,11 @@ options:
             type: string
         type: object
     type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   backups:
     default:
       enable: false
@@ -76,6 +146,7 @@ options:
         prune: 20 1 * * 0
       secret-key: s3-secret
       secret-name: backup-settings
+      use-barman: false
     examples:
     - enable: false
       endpoint: ''
@@ -94,6 +165,7 @@ options:
         prune: 20 1 * * 0
       secret-key: s3-secret
       secret-name: backup-settings
+      use-barman: false
     properties:
       enable:
         default: false
@@ -157,92 +229,15 @@ options:
       secret-name:
         default: backup-settings
         type: string
+      use-barman:
+        default: false
+        type: boolean
     type: object
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 10Gi
-      type: Filesystem
+  log-level:
+    default: 5
     examples:
-    - accessMode: ReadWriteOnce
-      size: 10Gi
-      type: Filesystem
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 10Gi
-        type: string
-      type:
-        default: Filesystem
-        enum:
-        - Filesystem
-        - block
-        type: string
-    type: object
-  hpa:
-    default:
-      avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    examples:
-    - avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    properties:
-      avg-cpu:
-        default: 50
-        type: integer
-      max-replicas:
-        default: 5
-        type: integer
-      min-replicas:
-        default: 1
-        type: integer
-    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  postgres:
-    default:
-      replicas: 1
-      storage: 5Gi
-      version: '14'
-    examples:
-    - replicas: 1
-      storage: 5Gi
-      version: '14'
-    properties:
-      replicas:
-        default: 1
-        type: integer
-      storage:
-        default: 5Gi
-        type: string
-      version:
-        default: '14'
-        type: string
-    type: object
-  modules:
-    default:
-    - societe
-    examples:
-    - - societe
-    items:
-      type: string
-    type: array
-  sub-domain:
-    default: erp
-    examples:
-    - erp
-    type: string
+    - 5
+    type: integer
   redis:
     default:
       exporter:
@@ -276,6 +271,46 @@ options:
         default: 2Gi
         type: string
     type: object
+  hpa:
+    default:
+      avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    examples:
+    - avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    properties:
+      avg-cpu:
+        default: 50
+        type: integer
+      max-replicas:
+        default: 5
+        type: integer
+      min-replicas:
+        default: 1
+        type: integer
+    type: object
+  postgres:
+    default:
+      replicas: 1
+      storage: 5Gi
+      version: '14'
+    examples:
+    - replicas: 1
+      storage: 5Gi
+      version: '14'
+    properties:
+      replicas:
+        default: 1
+        type: integer
+      storage:
+        default: 5Gi
+        type: string
+      version:
+        default: '14'
+        type: string
+    type: object
   images:
     default:
       dolibarr:
@@ -341,40 +376,10 @@ options:
             type: string
         type: object
     type: object
-  parameters:
-    default:
-      MAIN_LANG_DEFAULT: auto
+  domain:
+    default: your-company
     examples:
-    - MAIN_LANG_DEFAULT: auto
-    properties:
-      MAIN_LANG_DEFAULT:
-        default: auto
-        type: string
-    type: object
-  log-level:
-    default: 5
-    examples:
-    - 5
-    type: integer
-  user-groups:
-    default:
-    - admin: true
-      name: dolibarr-admin
-    examples:
-    - - admin: true
-        name: dolibarr-admin
-    items:
-      properties:
-        admin:
-          type: boolean
-        name:
-          type: string
-      type: object
-    type: array
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
+    - your-company
     type: string
 dependencies:
 - dist: null

apps/dolibarr/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" {