fix

apps/dbgate/configs.tf

@@ -24,8 +24,8 @@ locals {
   maria_conns = [for m in var.maria: join("_",["maria", m.namespace, m.name])]
 
   connections = join(",",concat(local.pg_conns, local.maria_conns))
-  connection_vars = merge(local.pg_vars, local.)
+  connection_vars = merge(local.pg_vars, local.maria_vars)
-  connection_secrets = merge(local.pg_secrets)
+  connection_secrets = merge(local.pg_secrets,local.maria_secrets)
 }
 
 resource "kubectl_manifest" "dbgate-config" {

apps/dbgate/index.yaml

@@ -6,42 +6,54 @@ 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
-  app-group:
+  images:
-    default: dev
-    examples:
-    - dev
-    type: string
-  storage:
     default:
-      size: 1Gi
+      dbgate:
-      accessMode: ReadWriteOnce
+        registry: docker.io
-      type: Filesystem
+        repository: dbgate/dbgate
+        tag: 5.2.6-alpine
+        pullPolicy: IfNotPresent
     properties:
-      type:
+      dbgate:
+        properties:
+          pullPolicy:
             enum:
-        - Filesystem
+            - Always
-        - Block
+            - Never
+            - IfNotPresent
             type: string
-        default: Filesystem
+            default: IfNotPresent
-      accessMode:
+          registry:
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
             type: string
-        default: ReadWriteOnce
+            default: docker.io
-      size:
+          repository:
             type: string
-        default: 1Gi
+            default: dbgate/dbgate
+          tag:
+            type: string
+            default: 5.2.6-alpine
+        type: object
+        default:
+          registry: docker.io
+          repository: dbgate/dbgate
+          tag: 5.2.6-alpine
+          pullPolicy: IfNotPresent
     examples:
-    - size: 1Gi
+    - dbgate:
-      accessMode: ReadWriteOnce
+        registry: docker.io
-      type: Filesystem
+        repository: dbgate/dbgate
+        tag: 5.2.6-alpine
+        pullPolicy: IfNotPresent
     type: object
   mongo:
     default: []
@@ -72,34 +84,6 @@ options:
     examples:
     - []
     type: array
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    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
   pg:
     default: []
     items:
@@ -129,55 +113,21 @@ options:
     examples:
     - []
     type: array
-  sub-domain:
+  app-group:
-    default: dbgate
+    default: dev
     examples:
-    - dbgate
+    - dev
     type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
-  images:
+  sub-domain:
-    default:
+    default: dbgate
-      dbgate:
-        registry: docker.io
-        repository: dbgate/dbgate
-        tag: 5.2.6-alpine
-        pullPolicy: IfNotPresent
-    properties:
-      dbgate:
-        properties:
-          pullPolicy:
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-            default: IfNotPresent
-          registry:
-            type: string
-            default: docker.io
-          repository:
-            type: string
-            default: dbgate/dbgate
-          tag:
-            type: string
-            default: 5.2.6-alpine
-        type: object
-        default:
-          registry: docker.io
-          repository: dbgate/dbgate
-          tag: 5.2.6-alpine
-          pullPolicy: IfNotPresent
     examples:
-    - dbgate:
+    - dbgate
-        registry: docker.io
+    type: string
-        repository: dbgate/dbgate
-        tag: 5.2.6-alpine
-        pullPolicy: IfNotPresent
-    type: object
   maria:
     default: []
     items:
@@ -204,6 +154,56 @@ options:
     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
+      accessMode: ReadWriteOnce
+      type: Filesystem
+    properties:
+      type:
+        enum:
+        - Filesystem
+        - Block
+        type: string
+        default: Filesystem
+      accessMode:
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+        default: ReadWriteOnce
+      size:
+        type: string
+        default: 1Gi
+    examples:
+    - size: 1Gi
+      accessMode: ReadWriteOnce
+      type: Filesystem
+    type: object
   issuer:
     default: letsencrypt-prod
     examples: