diff --git a/apps/dbgate/configs.tf b/apps/dbgate/configs.tf index be6273e..7d43811 100644 --- a/apps/dbgate/configs.tf +++ b/apps/dbgate/configs.tf @@ -44,8 +44,6 @@ locals { "OAUTH_LOGIN_FIELD" = "nickname" "OAUTH_SCOPE" = "email" } - - connections = join(",",concat(local.pg_conns, local.maria_conns, local.mongo_conns)) connection_vars = merge(local.pg_vars, local.maria_vars, local.mongo_vars) connection_secrets = merge(local.pg_secrets,local.mongo_secrets) diff --git a/apps/dbgate/deploy.tf b/apps/dbgate/deploy.tf index 0b8f5b2..463178d 100644 --- a/apps/dbgate/deploy.tf +++ b/apps/dbgate/deploy.tf @@ -40,23 +40,20 @@ resource "kubectl_manifest" "deploy" { securityContext: fsGroup: 1000 runAsGroup: 1000 - runAsUser: 0 + runAsUser: 1000 containers: - name: dbgate securityContext: fsGroup: 1000 runAsGroup: 1000 - runAsNonRoot: false - runAsUser: 0 + runAsNonRoot: true + runAsUser: 1000 envFrom: - secretRef: name: "${var.component}-${var.instance}" - configMapRef: name: "${var.component}-${var.instance}" env: ${jsonencode(local.deploy-envs)} - command: - - "/bin/bash" - - "/start.sh" image: "${var.images.dbgate.registry}/${var.images.dbgate.repository}:${var.images.dbgate.tag}" imagePullPolicy: "${var.images.dbgate.pullPolicy}" ports: @@ -87,9 +84,6 @@ resource "kubectl_manifest" "deploy" { readOnly: true - name: data mountPath: /home/node/.dbgate - - name: init - mountPath: "/start.sh" - subPath: "start.sh" restartPolicy: Always volumes: - name: certs @@ -101,9 +95,5 @@ resource "kubectl_manifest" "deploy" { claimName: "${var.component}-${var.instance}" - name: run emptyDir: {} - - name: init - configMap: - name: "${var.component}-${var.instance}-init" - defaultMode: 0777 EOF } diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml index dd6ca44..5d395de 100644 --- a/apps/dbgate/index.yaml +++ b/apps/dbgate/index.yaml @@ -6,12 +6,12 @@ metadata: name: dbgate description: null options: - issuer: - default: letsencrypt-prod + app-group: + default: dev examples: - - letsencrypt-prod + - dev type: string - maria: + mongo: default: [] examples: - [] @@ -40,11 +40,6 @@ options: type: string type: object type: array - use-oauth: - default: false - examples: - - false - type: boolean images: default: dbgate: @@ -84,30 +79,54 @@ options: type: string type: object type: object - domain-name: - default: your_company.com + issuer: + default: letsencrypt-prod examples: - - your_company.com + - letsencrypt-prod type: string - domain: - default: your-company + use-oauth: + default: false examples: - - your-company - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string + - false + type: boolean sub-domain: default: dbgate examples: - dbgate type: string - app-group: - default: dev + maria: + default: [] examples: - - dev + - [] + 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 + domain: + default: your-company + examples: + - your-company type: string storage: default: @@ -136,6 +155,11 @@ options: - Block type: string type: object + ingress-class: + default: traefik + examples: + - traefik + type: string pg: default: [] examples: @@ -165,35 +189,11 @@ options: type: string type: object type: array - mongo: - default: [] + domain-name: + default: your_company.com 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 + - your_company.com + type: string dependencies: - dist: null category: share