From c8423d18611fbbae64c21e3d92e3219c25909622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Sat, 14 Oct 2023 13:06:21 +0200
Subject: [PATCH] fix

---
 apps/dbgate/configs.tf |   2 +-
 apps/dbgate/index.yaml | 152 ++++++++++++++++++++---------------------
 2 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/apps/dbgate/configs.tf b/apps/dbgate/configs.tf
index f61a104..3db43b5 100644
--- a/apps/dbgate/configs.tf
+++ b/apps/dbgate/configs.tf
@@ -12,7 +12,7 @@ locals {
   pg_conns = [for pg in var.pg: join("_",["pg", pg.namespace, pg.name, pg.dbname])]
 
   maria_vars = merge([for m in var.maria: {
-    join("_",["LABEL_maria", m.namespace, m.name]) = join("|",["maria", m.namespace, pg.name])
+    join("_",["LABEL_maria", m.namespace, m.name]) = join("|",["maria", m.namespace, m.name])
     join("_",["ENGINE_maria", m.namespace, m.name]) = "mysql@dbgate-plugin-mysql"
     join("_",["SERVER_maria", m.namespace, m.name]) = join(".",[m.name, m.namespace, "svc"])
     join("_",["PORT_maria", m.namespace, m.name]) = "3306"
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index d4613d4..59c22ef 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,16 +6,39 @@ metadata:
   name: dbgate
   description: null
 options:
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
+  redis:
+    default: []
+    items:
+      type: object
+      properties:
+        namespace:
+          type: string
+          default: ''
+        name:
+          type: string
+          default: ''
+        secret:
+          type: object
+          properties:
+            name:
+              type: string
+              default: ''
+            key:
+              type: string
+              default: ''
+    examples:
+    - []
+    type: array
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   images:
     default:
       dbgate:
@@ -55,7 +78,22 @@ options:
         tag: 5.2.6-alpine
         pullPolicy: IfNotPresent
     type: object
-  mongo:
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  maria:
     default: []
     items:
       type: object
@@ -66,9 +104,6 @@ options:
         name:
           type: string
           default: ''
-        dbname:
-          type: string
-          default: ''
         username:
           type: string
           default: ''
@@ -113,70 +148,6 @@ options:
     examples:
     - []
     type: array
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  sub-domain:
-    default: dbgate
-    examples:
-    - dbgate
-    type: string
-  maria:
-    default: []
-    items:
-      type: object
-      properties:
-        namespace:
-          type: string
-          default: ''
-        name:
-          type: string
-          default: ''
-        username:
-          type: string
-          default: ''
-        secret:
-          type: object
-          properties:
-            name:
-              type: string
-              default: ''
-            key:
-              type: string
-              default: ''
-    examples:
-    - []
-    type: array
-  redis:
-    default: []
-    items:
-      type: object
-      properties:
-        namespace:
-          type: string
-          default: ''
-        name:
-          type: string
-          default: ''
-        secret:
-          type: object
-          properties:
-            name:
-              type: string
-              default: ''
-            key:
-              type: string
-              default: ''
-    examples:
-    - []
-    type: array
   storage:
     default:
       size: 1Gi
@@ -204,10 +175,39 @@ options:
       accessMode: ReadWriteOnce
       type: Filesystem
     type: object
-  issuer:
-    default: letsencrypt-prod
+  mongo:
+    default: []
+    items:
+      type: object
+      properties:
+        namespace:
+          type: string
+          default: ''
+        name:
+          type: string
+          default: ''
+        dbname:
+          type: string
+          default: ''
+        username:
+          type: string
+          default: ''
+        secret:
+          type: object
+          properties:
+            name:
+              type: string
+              default: ''
+            key:
+              type: string
+              default: ''
     examples:
-    - letsencrypt-prod
+    - []
+    type: array
+  sub-domain:
+    default: dbgate
+    examples:
+    - dbgate
     type: string
 dependencies:
 - dist: null