From 2a5296229f19f6c3f39d8d02d0042d89e9eaaaae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Fri, 11 Aug 2023 18:54:55 +0200
Subject: [PATCH] fix

---
 share/wildduck/index.yaml | 60 +++++++++++++++++++--------------------
 share/wildduck/mongo.tf   | 34 +++++++++++-----------
 2 files changed, 48 insertions(+), 46 deletions(-)

diff --git a/share/wildduck/index.yaml b/share/wildduck/index.yaml
index 722d837..2cccec7 100644
--- a/share/wildduck/index.yaml
+++ b/share/wildduck/index.yaml
@@ -6,21 +6,6 @@ metadata:
   name: wildduck
   description: null
 options:
-  sub-domain:
-    default: mail
-    examples:
-    - mail
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  additional-domains:
-    default: []
-    items:
-      type: string
-    type: array
   images:
     default:
       haraka:
@@ -184,6 +169,16 @@ options:
             type: string
         type: object
     type: object
+  additional-domains:
+    default: []
+    items:
+      type: string
+    type: array
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   redis:
     default:
       exporter:
@@ -217,6 +212,26 @@ options:
         default: 2Gi
         type: string
     type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  sub-domain:
+    default: mail
+    examples:
+    - mail
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   backups:
     default:
       enable: false
@@ -247,21 +262,6 @@ options:
         default: backup-settings
         type: string
     type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
 dependencies:
 - dist: null
   category: dbo
diff --git a/share/wildduck/mongo.tf b/share/wildduck/mongo.tf
index b08c242..fcf3d84 100644
--- a/share/wildduck/mongo.tf
+++ b/share/wildduck/mongo.tf
@@ -42,23 +42,25 @@ resource "kubectl_manifest" "prj_mongo" {
       type: ReplicaSet
       version: "4.4.0"
       statefulSet:
-        metadata:
-          annotations:
-            "k8up.io/backupcommand": "sh -c 'mongodump --username=$MONGODB_USER --password=$MONGODB_PASSWORD mongodb://localhost/$MONGODB_NAME --archive'"
-            "k8up.io/file-extension": ".archive"
         spec:
-          containers:
-          - name: mongod
-            env:
-            - name: MONGODB_NAME
-              value: ${var.component}
-            - name: MONGODB_USER
-              value: ${var.component}
-            - name: MONGODB_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: "${var.instance}-${var.component}-mongo"
-                  key: password
+          template:
+            metadata:
+              annotations:
+                "k8up.io/backupcommand": "sh -c 'mongodump --username=$MONGODB_USER --password=$MONGODB_PASSWORD mongodb://localhost/$MONGODB_NAME --archive'"
+                "k8up.io/file-extension": ".archive"
+            spec:
+              containers:
+              - name: mongod
+                env:
+                - name: MONGODB_NAME
+                  value: ${var.component}
+                - name: MONGODB_USER
+                  value: ${var.component}
+                - name: MONGODB_PASSWORD
+                  valueFrom:
+                    secretKeyRef:
+                      name: "${var.instance}-${var.component}-mongo"
+                      key: password
       security:
         authentication:
           modes: ["SCRAM"]