fix

2023-08-12 12:04:22 +02:00
parent 30bf0874ae
commit 8ff7906740
8 changed files with 552 additions and 552 deletions
--- a/apps/dolibarr/index.yaml
+++ b/apps/dolibarr/index.yaml
@@ -6,77 +6,6 @@ metadata:
  name: dolibarr
  description: null
 options:
-  sub-domain:
-    default: erp
-    examples:
-    - erp
-    type: string
-  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
-  redis:
-    default:
-      exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
-    examples:
-    - exporter:
-        enabled: true
-        image: quay.io/opstree/redis-exporter:v1.44.0
-      image: quay.io/opstree/redis:v7.0.5
-      storage: 2Gi
-    properties:
-      exporter:
-        default:
-          enabled: true
-          image: quay.io/opstree/redis-exporter:v1.44.0
-        properties:
-          enabled:
-            default: true
-            type: boolean
-          image:
-            default: quay.io/opstree/redis-exporter:v1.44.0
-            type: string
-        type: object
-      image:
-        default: quay.io/opstree/redis:v7.0.5
-        type: string
-      storage:
-        default: 2Gi
-        type: string
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  modules:
-    default:
-    - societe
-    examples:
-    - - societe
-    items:
-      type: string
-    type: array
  storage:
    default:
      accessMode: ReadWriteOnce
@@ -104,26 +33,6 @@ options:
        - block
        type: string
    type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  parameters:
-    default:
-      MAIN_LANG_DEFAULT: auto
-    examples:
-    - MAIN_LANG_DEFAULT: auto
-    properties:
-      MAIN_LANG_DEFAULT:
-        default: auto
-        type: string
-    type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
  images:
    default:
      dolibarr:
@@ -189,6 +98,59 @@ options:
            type: string
        type: object
    type: object
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  sub-domain:
+    default: erp
+    examples:
+    - erp
+    type: string
+  redis:
+    default:
+      exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
+    examples:
+    - exporter:
+        enabled: true
+        image: quay.io/opstree/redis-exporter:v1.44.0
+      image: quay.io/opstree/redis:v7.0.5
+      storage: 2Gi
+    properties:
+      exporter:
+        default:
+          enabled: true
+          image: quay.io/opstree/redis-exporter:v1.44.0
+        properties:
+          enabled:
+            default: true
+            type: boolean
+          image:
+            default: quay.io/opstree/redis-exporter:v1.44.0
+            type: string
+        type: object
+      image:
+        default: quay.io/opstree/redis:v7.0.5
+        type: string
+      storage:
+        default: 2Gi
+        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
  backups:
    default:
      enable: false
@@ -290,11 +252,6 @@ options:
        default: backup-settings
        type: string
    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
  user-groups:
    default:
    - admin: true
@@ -315,25 +272,35 @@ options:
    examples:
    - 5
    type: integer
-  postgres:
-    default:
-      replicas: 1
-      storage: 5Gi
-      version: '14'
+  issuer:
+    default: letsencrypt-prod
    examples:
-    - replicas: 1
-      storage: 5Gi
-      version: '14'
+    - letsencrypt-prod
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  hpa:
+    default:
+      avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
+    examples:
+    - avg-cpu: 50
+      max-replicas: 5
+      min-replicas: 1
    properties:
-      replicas:
+      avg-cpu:
+        default: 50
+        type: integer
+      max-replicas:
+        default: 5
+        type: integer
+      min-replicas:
        default: 1
        type: integer
-      storage:
-        default: 5Gi
-        type: string
-      version:
-        default: '14'
-        type: string
    type: object
  resources:
    default:
@@ -376,6 +343,39 @@ options:
            type: string
        type: object
    type: object
+  modules:
+    default:
+    - societe
+    examples:
+    - - societe
+    items:
+      type: string
+    type: array
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    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
 dependencies:
 - dist: null
  category: share
--- a/apps/dolibarr/postgresql.tf
+++ b/apps/dolibarr/postgresql.tf
@@ -2,7 +2,7 @@ locals {
  pg-labels = merge(local.common-labels, {
    "app.kubernetes.io/component" = "pg"
  })
-  backup-def = var.backups.enable ? {
+  backup-def = {
    retentionPolicy = var.backups.retention.db
    barmanObjectStore = {
      destinationPath = "s3://${var.instance}-${var.namespace}/"
@@ -18,7 +18,7 @@ locals {
        }
      }
    }
-  } : {}
+  }
 }

 resource "kubectl_manifest" "prj_pg" {
@@ -39,7 +39,7 @@ resource "kubectl_manifest" "prj_pg" {
          owner: "${var.component}"
      storage:
        size: "${var.postgres.storage}"
-      backup: ${jsonencode(local.backup-def)}
+      backup: ${jsonencode(var.backups.enable?local.backup-def:{})}
  EOF
 }