From d0bc1c58c716c47c5c549eb754098d4568395ac0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 20 Oct 2023 10:17:27 +0200 Subject: [PATCH] fix --- apps/dbgate/configs.tf | 1 + apps/dbgate/index.yaml | 154 ++++++++++++++++++++--------------------- 2 files changed, 78 insertions(+), 77 deletions(-) diff --git a/apps/dbgate/configs.tf b/apps/dbgate/configs.tf index dc79848..8fbb600 100644 --- a/apps/dbgate/configs.tf +++ b/apps/dbgate/configs.tf @@ -28,6 +28,7 @@ locals { mongo_vars = merge([for m in var.mongo: { join("_",["LABEL_mongo", m.namespace, m.name]) = join(" | ",["mongo", m.namespace, m.name]) join("_",["ENGINE_mongo", m.namespace, m.name]) = "mongo@dbgate-plugin-mongo" + join("_",["DATABASE_mongo", m.namespace, m.name]) = m.dbname }]...) mongo_secrets = merge([for index, m in var.mongo: { join("_",["URL_mongo", m.namespace, m.name]) = "mongodb://${m.username}:${urlencode(data.kubernetes_secret_v1.mongos[index].data[m.secret.key])}@${join(".",["${m.name}-svc", m.namespace, "svc"])}:27017/${m.dbname}" diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml index 9158940..2a881f2 100644 --- a/apps/dbgate/index.yaml +++ b/apps/dbgate/index.yaml @@ -6,11 +6,6 @@ metadata: name: dbgate description: null options: - use-oauth: - default: false - examples: - - false - type: boolean maria: default: [] examples: @@ -40,40 +35,16 @@ options: type: string type: object type: array - domain-name: - default: your_company.com + app-group: + default: dev examples: - - your_company.com + - dev type: string - pg: - default: [] + issuer: + default: letsencrypt-prod 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 + - letsencrypt-prod + type: string images: default: dbgate: @@ -113,11 +84,77 @@ options: 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 + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + sub-domain: + default: dbgate + examples: + - dbgate + type: string domain: default: your-company examples: - your-company type: string + pg: + default: [] + 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 mongo: default: [] examples: @@ -147,53 +184,16 @@ options: type: string type: object type: array - app-group: - default: dev - examples: - - dev - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - sub-domain: - default: dbgate - examples: - - dbgate - type: string ingress-class: default: traefik examples: - traefik type: string - storage: - default: - accessMode: ReadWriteOnce - size: 1Gi - type: Filesystem + use-oauth: + default: false 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 + - false + type: boolean dependencies: - dist: null category: share