fix

apps/dbgate/index.yaml

@@ -35,6 +35,40 @@ options:
           type: string
       type: object
     type: array
+  use-oauth:
+    default: false
+    examples:
+    - false
+    type: boolean
+  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
   images:
     default:
       dbgate:
@@ -74,50 +108,58 @@ options:
             type: string
         type: object
     type: object
-  pg:
-    default: []
+  app-group:
+    default: dev
     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
+    - dev
+    type: string
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   sub-domain:
     default: dbgate
     examples:
     - dbgate
     type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   issuer:
     default: letsencrypt-prod
     examples:
     - letsencrypt-prod
     type: string
+  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
   maria:
     default: []
     examples:
@@ -147,52 +189,10 @@ options:
           type: string
       type: object
     type: array
-  ingress-class:
-    default: traefik
+  domain-name:
+    default: your_company.com
     examples:
-    - traefik
-    type: string
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  use-oauth:
-    default: false
-    examples:
-    - false
-    type: boolean
-  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:
-    default: your-company
-    examples:
-    - your-company
+    - your_company.com
     type: string
 dependencies:
 - dist: null

apps/dbgate/presentation.tf

@@ -30,14 +30,14 @@ module "service" {
 
 module "ingress" {
   source = "/dist/modules/ingress"
-  component         = var.component
+  component         = ""
   instance          = var.instance
   namespace         = var.namespace
   issuer            = var.issuer
   ingress-class     = var.ingress-class
   labels            = local.common-labels
   dns-names         = local.dns-names
-  middlewares       = concat(["${var.instance}-https"], var.use-oauth?[]:["forward-${local.app-name}"])
+  middlewares       = var.use-oauth?[]:["forward-${local.app-name}"]
   service           = local.service
   providers = {
     kubectl = kubectl
@@ -66,6 +66,7 @@ module "oauth2" {
   namespace         = var.namespace
   labels            = local.common-labels
   dns-name          = local.dns-name
+  redirect-path     = ""
   providers = {
     kubernetes = kubernetes
     kubectl = kubectl