From 621ac17835ffc7a326e67fd066c85c6d5ae8bdc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sun, 29 Oct 2023 15:51:52 +0100 Subject: [PATCH] fix --- apps/dbgate/configs.tf | 2 +- apps/dbgate/index.yaml | 124 ++++++++++++++++++++--------------------- 2 files changed, 63 insertions(+), 63 deletions(-) diff --git a/apps/dbgate/configs.tf b/apps/dbgate/configs.tf index d0f0b53..4fd8cae 100644 --- 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(lookup(lookup(data.kubernetes_secret_v1.pgs,index,{"data"={}}),"data", {}), lookup(pg.secret,"key", "password"), "not-found") + join("_",["PASSWORD_pg", pg.namespace, pg.name, pg.dbname]) = lookup(lookup(element(data.kubernetes_secret_v1.pgs,index),"data", {}), lookup(pg.secret,"key", "password"), "not-found") }]...) pg_conns = [for pg in var.pg: join("_",["pg", pg.namespace, pg.name, pg.dbname])] diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml index 62506a8..ce1ee75 100644 --- a/apps/dbgate/index.yaml +++ b/apps/dbgate/index.yaml @@ -6,7 +6,31 @@ metadata: name: dbgate description: null options: - pg: + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + sub-domain: + default: dbgate + examples: + - dbgate + type: string + redis: + default: [] + examples: + - [] + items: + properties: + name: + default: '' + type: string + namespace: + default: '' + type: string + type: object + type: array + maria: default: [] examples: - [] @@ -35,46 +59,49 @@ options: type: string type: object type: array - sub-domain: - default: dbgate + ingress-class: + default: traefik examples: - - dbgate - type: string - app-group: - default: dev - examples: - - dev - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod + - traefik type: string domain: default: your-company examples: - your-company type: string - domain-name: - default: your_company.com + storage: + default: + accessMode: ReadWriteOnce + size: 1Gi + type: Filesystem examples: - - your_company.com + - 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 + app-group: + default: dev + examples: + - dev type: string - redis: - default: [] - examples: - - [] - items: - properties: - name: - default: '' - type: string - namespace: - default: '' - type: string - type: object - type: array - maria: + pg: default: [] examples: - [] @@ -171,37 +198,10 @@ options: type: string type: object type: object - storage: - default: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem + domain-name: + default: your_company.com 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 + - your_company.com type: string dependencies: - dist: null