fix

2023-10-29 15:48:57 +01:00
parent 4be102368c
commit dc8a905925
2 changed files with 124 additions and 124 deletions
--- a/apps/dbgate/configs.tf
+++ b/apps/dbgate/configs.tf
@@ -8,7 +8,7 @@ locals {
    join("_",["USER_pg", pg.namespace, pg.name, pg.dbname]) = pg.username
  }]...)
  pg_secrets = merge([for index, pg in var.pg: {
-    join("_",["PASSWORD_pg", pg.namespace, pg.name, pg.dbname]) = lookup(data.kubernetes_secret_v1.pgs[index].data, lookup(pg.secret,"key", "password"), "not-found")
+    join("_",["PASSWORD_pg", pg.namespace, pg.name, pg.dbname]) = lookup(lookup(lookup(data.kubernetes_secret_v1.pgs,index,{"data"={}}),"data", {}), lookup(pg.secret,"key", "password"), "not-found")
  }]...)
  pg_conns = [for pg in var.pg: join("_",["pg", pg.namespace, pg.name, pg.dbname])]

--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,45 +6,60 @@ metadata:
  name: dbgate
  description: null
 options:
-  images:
-    default:
-      dbgate:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: dbgate/dbgate
-        tag: 5.2.7-alpine
+  pg:
+    default: []
    examples:
-    - dbgate:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: dbgate/dbgate
-        tag: 5.2.7-alpine
-    properties:
-      dbgate:
-        default:
-          pullPolicy: IfNotPresent
-          registry: docker.io
-          repository: dbgate/dbgate
-          tag: 5.2.7-alpine
-        properties:
-          pullPolicy:
-            default: IfNotPresent
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-          registry:
-            default: docker.io
-            type: string
-          repository:
-            default: dbgate/dbgate
-            type: string
-          tag:
-            default: 5.2.7-alpine
-            type: string
-        type: object
-    type: object
+    - []
+    items:
+      properties:
+        dbname:
+          default: ''
+          type: string
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+        secret:
+          properties:
+            key:
+              default: ''
+              type: string
+            name:
+              default: ''
+              type: string
+          type: object
+        username:
+          default: ''
+          type: string
+      type: object
+    type: array
+  sub-domain:
+    default: dbgate
+    examples:
+    - dbgate
+    type: string
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  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
  redis:
    default: []
    examples:
@@ -59,63 +74,6 @@ options:
          type: string
      type: object
    type: array
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  storage:
-    default:
-      accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
-    examples:
-    - accessMode: ReadWriteOnce
-      size: 1Gi
-      type: Filesystem
-    properties:
-      accessMode:
-        default: ReadWriteOnce
-        enum:
-        - ReadWriteOnce
-        - ReadOnlyMany
-        - ReadWriteMany
-        type: string
-      size:
-        default: 1Gi
-        type: string
-      type:
-        default: Filesystem
-        enum:
-        - Filesystem
-        - Block
-        type: string
-    type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  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
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
  maria:
    default: []
    examples:
@@ -174,35 +132,77 @@ options:
          type: string
      type: object
    type: array
-  pg:
-    default: []
+  images:
+    default:
+      dbgate:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: dbgate/dbgate
+        tag: 5.2.7-alpine
    examples:
-    - []
-    items:
-      properties:
-        dbname:
-          default: ''
-          type: string
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-        secret:
-          properties:
-            key:
-              default: ''
-              type: string
-            name:
-              default: ''
-              type: string
-          type: object
-        username:
-          default: ''
-          type: string
-      type: object
-    type: array
+    - dbgate:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: dbgate/dbgate
+        tag: 5.2.7-alpine
+    properties:
+      dbgate:
+        default:
+          pullPolicy: IfNotPresent
+          registry: docker.io
+          repository: dbgate/dbgate
+          tag: 5.2.7-alpine
+        properties:
+          pullPolicy:
+            default: IfNotPresent
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+          registry:
+            default: docker.io
+            type: string
+          repository:
+            default: dbgate/dbgate
+            type: string
+          tag:
+            default: 5.2.7-alpine
+            type: string
+        type: object
+    type: object
+  storage:
+    default:
+      accessMode: ReadWriteOnce
+      size: 1Gi
+      type: Filesystem
+    examples:
+    - accessMode: ReadWriteOnce
+      size: 1Gi
+      type: Filesystem
+    properties:
+      accessMode:
+        default: ReadWriteOnce
+        enum:
+        - ReadWriteOnce
+        - ReadOnlyMany
+        - ReadWriteMany
+        type: string
+      size:
+        default: 1Gi
+        type: string
+      type:
+        default: Filesystem
+        enum:
+        - Filesystem
+        - Block
+        type: string
+    type: object
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
 dependencies:
 - dist: null
  category: share