From c9033fcd4f529eea06a4a53039a94c51cb4af063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Huss?= <sebastien.huss@gmail.com>
Date: Wed, 18 Oct 2023 12:39:55 +0200
Subject: [PATCH] fix

---
 apps/dbgate/configs.tf |  7 +---
 apps/dbgate/index.yaml | 90 +++++++++++++++++++++---------------------
 2 files changed, 47 insertions(+), 50 deletions(-)

diff --git a/apps/dbgate/configs.tf b/apps/dbgate/configs.tf
index a5e4fc4..f37c482 100644
--- a/apps/dbgate/configs.tf
+++ b/apps/dbgate/configs.tf
@@ -62,11 +62,8 @@ resource "kubectl_manifest" "dbgate-init" {
       labels: ${jsonencode(local.common-labels)}
     data:
       start.sh: |-
-        mkdir -p /usr/local/share/ca-certificates/
-        cp /etc/local-ca/ca.crt /usr/local/share/ca-certificates/
-        /usr/sbin/update-ca-certificates
-        /bin/su - node -c /home/dbgate/entrypoint.sh "$@"
-        sleep infinity
+        [ -e /etc/local-ca/ca.crt ] && cat /etc/local-ca/ca.crt >> /etc/ssl/certs/ca-certificates.crt
+        exec /bin/su - node -c /home/dbgate-docker/entrypoint.sh "$@"
   EOF
 }
 
diff --git a/apps/dbgate/index.yaml b/apps/dbgate/index.yaml
index a28cd93..ec76373 100644
--- a/apps/dbgate/index.yaml
+++ b/apps/dbgate/index.yaml
@@ -6,12 +6,17 @@ metadata:
   name: dbgate
   description: null
 options:
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  pg:
+  maria:
     default: []
     examples:
     - []
@@ -40,11 +45,35 @@ options:
           type: string
       type: object
     type: array
-  sub-domain:
-    default: dbgate
+  mongo:
+    default: []
     examples:
-    - dbgate
-    type: string
+    - []
+    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
   images:
     default:
       dbgate:
@@ -84,7 +113,7 @@ options:
             type: string
         type: object
     type: object
-  maria:
+  pg:
     default: []
     examples:
     - []
@@ -113,55 +142,26 @@ options:
           type: string
       type: object
     type: array
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  sub-domain:
+    default: dbgate
+    examples:
+    - dbgate
+    type: string
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  mongo:
-    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
   app-group:
     default: dev
     examples:
     - dev
     type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
   storage:
     default:
       accessMode: ReadWriteOnce