This commit is contained in:
2023-10-18 18:21:30 +02:00
parent 2197dd83a0
commit 1fac3163f7
3 changed files with 55 additions and 67 deletions

View File

@@ -44,8 +44,6 @@ locals {
"OAUTH_LOGIN_FIELD" = "nickname" "OAUTH_LOGIN_FIELD" = "nickname"
"OAUTH_SCOPE" = "email" "OAUTH_SCOPE" = "email"
} }
connections = join(",",concat(local.pg_conns, local.maria_conns, local.mongo_conns)) 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_vars = merge(local.pg_vars, local.maria_vars, local.mongo_vars)
connection_secrets = merge(local.pg_secrets,local.mongo_secrets) connection_secrets = merge(local.pg_secrets,local.mongo_secrets)

View File

@@ -40,23 +40,20 @@ resource "kubectl_manifest" "deploy" {
securityContext: securityContext:
fsGroup: 1000 fsGroup: 1000
runAsGroup: 1000 runAsGroup: 1000
runAsUser: 0 runAsUser: 1000
containers: containers:
- name: dbgate - name: dbgate
securityContext: securityContext:
fsGroup: 1000 fsGroup: 1000
runAsGroup: 1000 runAsGroup: 1000
runAsNonRoot: false runAsNonRoot: true
runAsUser: 0 runAsUser: 1000
envFrom: envFrom:
- secretRef: - secretRef:
name: "${var.component}-${var.instance}" name: "${var.component}-${var.instance}"
- configMapRef: - configMapRef:
name: "${var.component}-${var.instance}" name: "${var.component}-${var.instance}"
env: ${jsonencode(local.deploy-envs)} env: ${jsonencode(local.deploy-envs)}
command:
- "/bin/bash"
- "/start.sh"
image: "${var.images.dbgate.registry}/${var.images.dbgate.repository}:${var.images.dbgate.tag}" image: "${var.images.dbgate.registry}/${var.images.dbgate.repository}:${var.images.dbgate.tag}"
imagePullPolicy: "${var.images.dbgate.pullPolicy}" imagePullPolicy: "${var.images.dbgate.pullPolicy}"
ports: ports:
@@ -87,9 +84,6 @@ resource "kubectl_manifest" "deploy" {
readOnly: true readOnly: true
- name: data - name: data
mountPath: /home/node/.dbgate mountPath: /home/node/.dbgate
- name: init
mountPath: "/start.sh"
subPath: "start.sh"
restartPolicy: Always restartPolicy: Always
volumes: volumes:
- name: certs - name: certs
@@ -101,9 +95,5 @@ resource "kubectl_manifest" "deploy" {
claimName: "${var.component}-${var.instance}" claimName: "${var.component}-${var.instance}"
- name: run - name: run
emptyDir: {} emptyDir: {}
- name: init
configMap:
name: "${var.component}-${var.instance}-init"
defaultMode: 0777
EOF EOF
} }

View File

@@ -6,12 +6,12 @@ metadata:
name: dbgate name: dbgate
description: null description: null
options: options:
issuer: app-group:
default: letsencrypt-prod default: dev
examples: examples:
- letsencrypt-prod - dev
type: string type: string
maria: mongo:
default: [] default: []
examples: examples:
- [] - []
@@ -40,11 +40,6 @@ options:
type: string type: string
type: object type: object
type: array type: array
use-oauth:
default: false
examples:
- false
type: boolean
images: images:
default: default:
dbgate: dbgate:
@@ -84,30 +79,54 @@ options:
type: string type: string
type: object type: object
type: object type: object
domain-name: issuer:
default: your_company.com default: letsencrypt-prod
examples: examples:
- your_company.com - letsencrypt-prod
type: string type: string
domain: use-oauth:
default: your-company default: false
examples: examples:
- your-company - false
type: string type: boolean
ingress-class:
default: traefik
examples:
- traefik
type: string
sub-domain: sub-domain:
default: dbgate default: dbgate
examples: examples:
- dbgate - dbgate
type: string type: string
app-group: maria:
default: dev default: []
examples: 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 type: string
storage: storage:
default: default:
@@ -136,6 +155,11 @@ options:
- Block - Block
type: string type: string
type: object type: object
ingress-class:
default: traefik
examples:
- traefik
type: string
pg: pg:
default: [] default: []
examples: examples:
@@ -165,35 +189,11 @@ options:
type: string type: string
type: object type: object
type: array type: array
mongo: domain-name:
default: [] default: your_company.com
examples: examples:
- [] - your_company.com
items: type: string
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
dependencies: dependencies:
- dist: null - dist: null
category: share category: share