fix

share/dataset-pg/index.yaml

@@ -6,6 +6,35 @@ metadata:
   name: dataset-pg
   description: null
 options:
+  databases:
+    default: []
+    items:
+      properties:
+        name:
+          default: db
+          type: string
+      type: object
+    type: array
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  app_group:
+    default: api
+    examples:
+    - api
+    type: string
   images:
     default:
       postgresql:
@@ -35,12 +64,17 @@ options:
             type: number
         type: object
     type: object
-  databases:
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  roles:
     default: []
     items:
       properties:
         name:
-          default: db
+          default: alt-account
           type: string
       type: object
     type: array
@@ -49,6 +83,11 @@ options:
     examples:
     - your-company
     type: string
+  sub-domain:
+    default: dataset-pg
+    examples:
+    - dataset-pg
+    type: string
   storage:
     default:
       postgres:
@@ -66,99 +105,11 @@ options:
             type: string
         type: object
     type: object
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      retention:
-        db: 30d
-      schedule:
-        db: 0 3 * * *
-      secret-key: s3-secret
-      secret-name: backup-settings
-    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      retention:
-        db: 30d
-      schedule:
-        db: 0 3 * * *
-      secret-key: s3-secret
-      secret-name: backup-settings
-    properties:
-      enable:
-        default: false
-        type: boolean
-      endpoint:
-        default: ''
-        type: string
-      key-id-key:
-        default: s3-id
-        type: string
-      retention:
-        default:
-          db: 30d
-        properties:
-          db:
-            default: 30d
-            type: string
-        type: object
-      schedule:
-        default:
-          db: 0 3 * * *
-        properties:
-          db:
-            default: 0 3 * * *
-            type: string
-        type: object
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-    type: object
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
-  sub-domain:
-    default: dataset-pg
-    examples:
-    - dataset-pg
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   domain_name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  app_group:
-    default: api
-    examples:
-    - api
-    type: string
   extentions:
     default:
       directus:
@@ -340,11 +291,60 @@ options:
             type: object
         type: object
     type: object
-  issuer:
-    default: letsencrypt-prod
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      retention:
+        db: 30d
+      schedule:
+        db: 0 3 * * *
+      secret-key: s3-secret
+      secret-name: backup-settings
     examples:
-    - letsencrypt-prod
-    type: string
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      retention:
+        db: 30d
+      schedule:
+        db: 0 3 * * *
+      secret-key: s3-secret
+      secret-name: backup-settings
+    properties:
+      enable:
+        default: false
+        type: boolean
+      endpoint:
+        default: ''
+        type: string
+      key-id-key:
+        default: s3-id
+        type: string
+      retention:
+        default:
+          db: 30d
+        properties:
+          db:
+            default: 30d
+            type: string
+        type: object
+      schedule:
+        default:
+          db: 0 3 * * *
+        properties:
+          db:
+            default: 0 3 * * *
+            type: string
+        type: object
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
 dependencies:
 - dist: null
   category: dbo

share/dataset-pg/postgrest.tf

@@ -157,7 +157,9 @@ module "postgrest-ingress" {
   dns_names         = [local.prest-dns_name]
   create-redirect   = true
   middlewares       = []
-  services          = [local.prest-service]
+  sub_paths         = ["ui",""]
+  services          = [local.swagger-service, local.prest-service]
+  services          = []
   providers = {
     kubectl = kubectl
   }
@@ -176,23 +178,3 @@ module "swagger-service" {
     kubectl = kubectl
   }
 }
-
-module "swagger-ingress" {
-  count = var.extentions.postgrest.enable && var.extentions.postgrest.swagger.enable ? 1 : 0
-  source = "git::https://git.solidite.fr/vynil/kydah-modules.git//ingress"
-  component         = "swagger"
-  instance          = var.instance
-  namespace         = var.namespace
-  issuer            = var.issuer
-  ingress_class     = var.ingress_class
-  labels            = local.prest-labels
-  dns_names         = [local.prest-dns_name]
-  middlewares       = []
-  create-cert       = false
-  sub-path          = "ui"
-  secret-component  = "postgrest"
-  services          = [local.swagger-service]
-  providers = {
-    kubectl = kubectl
-  }
-}