From d0cccb5177e8f1258a5e8e73d73a28362e5b6f16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Sun, 15 Oct 2023 18:27:52 +0200
Subject: [PATCH] fix

---
 apps/dbgate/deploy.tf  |  16 +++--
 apps/dbgate/index.yaml | 138 ++++++++++++++++++++---------------------
 2 files changed, 76 insertions(+), 78 deletions(-)

diff --git a/apps/dbgate/deploy.tf b/apps/dbgate/deploy.tf
index 131bedf..6172187 100644
--- a/apps/dbgate/deploy.tf
+++ b/apps/dbgate/deploy.tf
@@ -17,11 +17,6 @@ resource "kubectl_manifest" "deploy" {
           securityContext:
             fsGroup: 1000
             runAsGroup: 1000
-          volumes:
-          - name: certs
-            secret:
-              secretName: "${var.instance}-cert"
-              defaultMode: 0444
           containers:
           - name: dbgate
             securityContext:
@@ -29,10 +24,6 @@ resource "kubectl_manifest" "deploy" {
               runAsGroup: 1000
               runAsNonRoot: true
               runAsUser: 1000
-            volumeMounts:
-            - name: certs
-              mountPath: /etc/local-ca
-              readOnly: true
             envFrom:
             - secretRef:
                 name: "${var.component}-${var.instance}"
@@ -76,6 +67,9 @@ resource "kubectl_manifest" "deploy" {
               successThreshold: 1
               timeoutSeconds: 1
             volumeMounts:
+            - name: certs
+              mountPath: /etc/local-ca
+              readOnly: true
             - name: data
               mountPath: /home/node/.dbgate
           restartPolicy: Always
@@ -85,6 +79,10 @@ resource "kubectl_manifest" "deploy" {
             runAsNonRoot: true
             runAsUser: 1000
           volumes:
+          - name: certs
+            secret:
+              secretName: "${var.instance}-cert"
+              defaultMode: 0444
           - name: data
             persistentVolumeClaim:
               claimName: "${var.component}-${var.instance}"
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index 694589e..e058652 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,59 +6,10 @@ metadata:
   name: dbgate
   description: null
 options:
-  images:
-    default:
-      dbgate:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: dbgate/dbgate
-        tag: 5.2.6-alpine
+  sub-domain:
+    default: dbgate
     examples:
-    - dbgate:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: dbgate/dbgate
-        tag: 5.2.6-alpine
-    properties:
-      dbgate:
-        default:
-          pullPolicy: IfNotPresent
-          registry: docker.io
-          repository: dbgate/dbgate
-          tag: 5.2.6-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.6-alpine
-            type: string
-        type: object
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
+    - dbgate
     type: string
   storage:
     default:
@@ -87,12 +38,7 @@ options:
         - Block
         type: string
     type: object
-  sub-domain:
-    default: dbgate
-    examples:
-    - dbgate
-    type: string
-  pg:
+  maria:
     default: []
     examples:
     - []
@@ -150,7 +96,71 @@ options:
           type: string
       type: object
     type: array
-  maria:
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  images:
+    default:
+      dbgate:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: dbgate/dbgate
+        tag: 5.2.6-alpine
+    examples:
+    - dbgate:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: dbgate/dbgate
+        tag: 5.2.6-alpine
+    properties:
+      dbgate:
+        default:
+          pullPolicy: IfNotPresent
+          registry: docker.io
+          repository: dbgate/dbgate
+          tag: 5.2.6-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.6-alpine
+            type: string
+        type: object
+    type: object
+  pg:
     default: []
     examples:
     - []
@@ -179,16 +189,6 @@ options:
           type: string
       type: object
     type: array
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
 dependencies:
 - dist: null
   category: share