fix

apps/dbgate/index.yaml

@@ -6,108 +6,6 @@ metadata:
   name: dbgate
   description: null
 options:
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  redis:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-      type: object
-    type: array
-  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
-  sub-domain:
-    default: dbgate
-    examples:
-    - dbgate
-    type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  app_group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  maria:
-    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
   pg:
     default: []
     examples:
@@ -137,6 +35,135 @@ options:
           type: string
       type: object
     type: array
+  storage:
+    default:
+      volume:
+        accessMode: ReadWriteOnce
+        size: 1Gi
+        type: Filesystem
+    description: Configure this app storage
+    examples:
+    - volume:
+        accessMode: ReadWriteOnce
+        size: 1Gi
+        type: Filesystem
+    properties:
+      volume:
+        default:
+          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
+    type: object
+  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
+  maria:
+    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
+  sub-domain:
+    default: dbgate
+    examples:
+    - dbgate
+    type: string
+  redis:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+      type: object
+    type: array
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   images:
     default:
       dbgate:
@@ -176,43 +203,16 @@ options:
             type: string
         type: object
     type: object
-  storage:
+  domain_name:
-    default:
+    default: your_company.com
-      volume:
-        accessMode: ReadWriteOnce
-        size: 1Gi
-        type: Filesystem
-    description: Configure this app storage
     examples:
-    - volume:
+    - your_company.com
-        accessMode: ReadWriteOnce
+    type: string
-        size: 1Gi
+  domain:
-        type: Filesystem
+    default: your-company
-    properties:
+    examples:
-      volume:
+    - your-company
-        default:
+    type: string
-          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
-    type: object
 dependencies:
 - dist: null
   category: core

apps/dbgate/presentation.tf

@@ -62,6 +62,7 @@ module "oauth2" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
+  domain            = var.domain
   labels            = local.common-labels
   dns_name          = local.dns_name
   redirect_path     = ""

apps/gitea/index.yaml

@@ -9,6 +9,26 @@ metadata:
     A painless self-hosted Git service.
     Gitea is a community managed lightweight code hosting solution written in Go. It is published under the MIT license.
 options:
+  webhook:
+    default:
+      allowed-hosts: private
+      skip-tls-verify: false
+    examples:
+    - allowed-hosts: private
+      skip-tls-verify: false
+    properties:
+      allowed-hosts:
+        default: private
+        type: string
+      skip-tls-verify:
+        default: false
+        type: boolean
+    type: object
+  sub-domain:
+    default: git
+    examples:
+    - git
+    type: string
   backups:
     default:
       enable: false
@@ -115,177 +135,16 @@ options:
         default: false
         type: boolean
     type: object
-  ssh-sub-domain:
-    default: git
-    examples:
-    - git
-    type: string
-  push-create:
-    default:
-      org: 'true'
-      private: 'false'
-      user: 'true'
-    examples:
-    - org: 'true'
-      private: 'false'
-      user: 'true'
-    properties:
-      org:
-        default: 'true'
-        type: string
-      private:
-        default: 'false'
-        type: string
-      user:
-        default: 'true'
-        type: string
-    type: object
-  admin:
-    default:
-      email: git-admin@git.your_company.com
-      name: gitea_admin
-    examples:
-    - email: git-admin@git.your_company.com
-      name: gitea_admin
-    properties:
-      email:
-        default: git-admin@git.your_company.com
-        type: string
-      name:
-        default: gitea_admin
-        type: string
-    type: object
-  app_group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  storage:
-    default:
-      postgres:
-        size: 10Gi
-      redis:
-        size: 2Gi
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    description: Configure this app storage
-    examples:
-    - postgres:
-        size: 10Gi
-      redis:
-        size: 2Gi
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    properties:
-      postgres:
-        default:
-          size: 10Gi
-        properties:
-          size:
-            default: 10Gi
-            type: string
-        type: object
-      redis:
-        default:
-          size: 2Gi
-        properties:
-          size:
-            default: 2Gi
-            type: string
-        type: object
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          size: 10Gi
-          type: Filesystem
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            enum:
-            - ReadWriteOnce
-            - ReadOnlyMany
-            - ReadWriteMany
-            type: string
-          size:
-            default: 10Gi
-            type: string
-          type:
-            default: Filesystem
-            enum:
-            - Filesystem
-            - Block
-            type: string
-        type: object
-    type: object
-  replicas:
-    default: 1
-    examples:
-    - 1
-    type: integer
   theme:
     default: gitea-modern
     examples:
     - gitea-modern
     type: string
-  webhook:
+  timezone:
-    default:
+    default: Europe/Paris
-      allowed-hosts: private
-      skip-tls-verify: false
     examples:
-    - allowed-hosts: private
+    - Europe/Paris
-      skip-tls-verify: false
-    properties:
-      allowed-hosts:
-        default: private
-        type: string
-      skip-tls-verify:
-        default: false
-        type: boolean
-    type: object
-  sub-domain:
-    default: git
-    examples:
-    - git
     type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  ssh-port:
-    default: 2222
-    examples:
-    - 2222
-    type: integer
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  disable-registration:
-    default: true
-    examples:
-    - true
-    type: boolean
   redis:
     default:
       exporter:
@@ -434,10 +293,131 @@ options:
             type: string
         type: object
     type: object
-  timezone:
+  ingress_class:
-    default: Europe/Paris
+    default: traefik
     examples:
-    - Europe/Paris
+    - traefik
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  storage:
+    default:
+      postgres:
+        size: 10Gi
+      redis:
+        size: 2Gi
+      volume:
+        accessMode: ReadWriteOnce
+        size: 10Gi
+        type: Filesystem
+    description: Configure this app storage
+    examples:
+    - postgres:
+        size: 10Gi
+      redis:
+        size: 2Gi
+      volume:
+        accessMode: ReadWriteOnce
+        size: 10Gi
+        type: Filesystem
+    properties:
+      postgres:
+        default:
+          size: 10Gi
+        properties:
+          size:
+            default: 10Gi
+            type: string
+        type: object
+      redis:
+        default:
+          size: 2Gi
+        properties:
+          size:
+            default: 2Gi
+            type: string
+        type: object
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          size: 10Gi
+          type: Filesystem
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            enum:
+            - ReadWriteOnce
+            - ReadOnlyMany
+            - ReadWriteMany
+            type: string
+          size:
+            default: 10Gi
+            type: string
+          type:
+            default: Filesystem
+            enum:
+            - Filesystem
+            - Block
+            type: string
+        type: object
+    type: object
+  ssh-sub-domain:
+    default: git
+    examples:
+    - git
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  push-create:
+    default:
+      org: 'true'
+      private: 'false'
+      user: 'true'
+    examples:
+    - org: 'true'
+      private: 'false'
+      user: 'true'
+    properties:
+      org:
+        default: 'true'
+        type: string
+      private:
+        default: 'false'
+        type: string
+      user:
+        default: 'true'
+        type: string
+    type: object
+  replicas:
+    default: 1
+    examples:
+    - 1
+    type: integer
+  app_group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
     type: string
   load-balancer:
     default:
@@ -449,21 +429,41 @@ options:
         default: ''
         type: string
     type: object
-  release:
+  ssh-port:
-    default: 8.3.0
+    default: 2222
     examples:
-    - 8.3.0
+    - 2222
-    type: string
+    type: integer
   default-branch:
     default: main
     examples:
     - main
     type: string
-  domain_name:
+  admin:
-    default: your_company.com
+    default:
+      email: git-admin@git.your_company.com
+      name: gitea_admin
     examples:
-    - your_company.com
+    - email: git-admin@git.your_company.com
+      name: gitea_admin
+    properties:
+      email:
+        default: git-admin@git.your_company.com
+        type: string
+      name:
+        default: gitea_admin
+        type: string
+    type: object
+  release:
+    default: 8.3.0
+    examples:
+    - 8.3.0
     type: string
+  disable-registration:
+    default: true
+    examples:
+    - true
+    type: boolean
 dependencies:
 - dist: null
   category: share

apps/gitea/presentation.tf

@@ -49,6 +49,7 @@ module "oauth2" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
+  domain            = var.domain
   labels            = local.common-labels
   dns_name          = local.dns_name
   redirect_path     = "user/oauth2/vynil/callback"

apps/nextcloud/index.yaml

@@ -6,11 +6,67 @@ metadata:
   name: nextcloud
   description: null
 options:
-  app_group:
+  storage:
-    default: ''
+    default:
+      postgres:
+        size: 5Gi
+      redis:
+        size: 2Gi
+      volume:
+        accessMode: ReadWriteOnce
+        size: 10Gi
+        type: Filesystem
+    description: Configure this app storage
     examples:
-    - ''
+    - postgres:
-    type: string
+        size: 5Gi
+      redis:
+        size: 2Gi
+      volume:
+        accessMode: ReadWriteOnce
+        size: 10Gi
+        type: Filesystem
+    properties:
+      postgres:
+        default:
+          size: 5Gi
+        properties:
+          size:
+            default: 5Gi
+            type: string
+        type: object
+      redis:
+        default:
+          size: 2Gi
+        properties:
+          size:
+            default: 2Gi
+            type: string
+        type: object
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          size: 10Gi
+          type: Filesystem
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            enum:
+            - ReadWriteOnce
+            - ReadOnlyMany
+            - ReadWriteMany
+            type: string
+          size:
+            default: 10Gi
+            type: string
+          type:
+            default: Filesystem
+            enum:
+            - Filesystem
+            - Block
+            type: string
+        type: object
+    type: object
   images:
     default:
       collabora:
@@ -266,148 +322,26 @@ options:
             type: string
         type: object
     type: object
-  domain_name:
+  hpa:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  redis:
     default:
-      exporter:
+      avg-cpu: 50
-        enabled: true
+      max-replicas: 5
+      min-replicas: 1
     examples:
-    - exporter:
+    - avg-cpu: 50
-        enabled: true
+      max-replicas: 5
+      min-replicas: 1
     properties:
-      exporter:
+      avg-cpu:
-        default:
+        default: 50
-          enabled: true
+        type: integer
-        properties:
+      max-replicas:
-          enabled:
+        default: 5
-            default: true
+        type: integer
-            type: boolean
+      min-replicas:
-        type: object
-    type: object
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
         default: 1
         type: integer
     type: object
-  sub-domain:
-    default: files
-    examples:
-    - files
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  apps:
-    default:
-      audioplayer: false
-      bookmarks: false
-      bpm: false
-      calendar: false
-      collabora: false
-      contacts: false
-      deck: false
-      groupfolders: true
-      mindmap: false
-      music: false
-      notes: false
-      onlyoffice: false
-      passman: false
-      spreed: false
-      tables: false
-      tasks: false
-      texteditor: true
-    examples:
-    - audioplayer: false
-      bookmarks: false
-      bpm: false
-      calendar: false
-      collabora: false
-      contacts: false
-      deck: false
-      groupfolders: true
-      mindmap: false
-      music: false
-      notes: false
-      onlyoffice: false
-      passman: false
-      spreed: false
-      tables: false
-      tasks: false
-      texteditor: true
-    properties:
-      audioplayer:
-        default: false
-        type: boolean
-      bookmarks:
-        default: false
-        type: boolean
-      bpm:
-        default: false
-        type: boolean
-      calendar:
-        default: false
-        type: boolean
-      collabora:
-        default: false
-        type: boolean
-      contacts:
-        default: false
-        type: boolean
-      deck:
-        default: false
-        type: boolean
-      groupfolders:
-        default: true
-        type: boolean
-      mindmap:
-        default: false
-        type: boolean
-      music:
-        default: false
-        type: boolean
-      notes:
-        default: false
-        type: boolean
-      onlyoffice:
-        default: false
-        type: boolean
-      passman:
-        default: false
-        type: boolean
-      spreed:
-        default: false
-        type: boolean
-      tables:
-        default: false
-        type: boolean
-      tasks:
-        default: false
-        type: boolean
-      texteditor:
-        default: true
-        type: boolean
-    type: object
   backups:
     default:
       enable: false
@@ -514,26 +448,6 @@ options:
         default: false
         type: boolean
     type: object
-  hpa:
-    default:
-      avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    examples:
-    - avg-cpu: 50
-      max-replicas: 5
-      min-replicas: 1
-    properties:
-      avg-cpu:
-        default: 50
-        type: integer
-      max-replicas:
-        default: 5
-        type: integer
-      min-replicas:
-        default: 1
-        type: integer
-    type: object
   admin:
     default:
       name: nextcloud_admin
@@ -544,72 +458,158 @@ options:
         default: nextcloud_admin
         type: string
     type: object
-  storage:
-    default:
-      postgres:
-        size: 5Gi
-      redis:
-        size: 2Gi
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    description: Configure this app storage
-    examples:
-    - postgres:
-        size: 5Gi
-      redis:
-        size: 2Gi
-      volume:
-        accessMode: ReadWriteOnce
-        size: 10Gi
-        type: Filesystem
-    properties:
-      postgres:
-        default:
-          size: 5Gi
-        properties:
-          size:
-            default: 5Gi
-            type: string
-        type: object
-      redis:
-        default:
-          size: 2Gi
-        properties:
-          size:
-            default: 2Gi
-            type: string
-        type: object
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          size: 10Gi
-          type: Filesystem
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            enum:
-            - ReadWriteOnce
-            - ReadOnlyMany
-            - ReadWriteMany
-            type: string
-          size:
-            default: 10Gi
-            type: string
-          type:
-            default: Filesystem
-            enum:
-            - Filesystem
-            - Block
-            type: string
-        type: object
-    type: object
   openid-name:
     default: vynil
     examples:
     - vynil
     type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  redis:
+    default:
+      exporter:
+        enabled: true
+    examples:
+    - exporter:
+        enabled: true
+    properties:
+      exporter:
+        default:
+          enabled: true
+        properties:
+          enabled:
+            default: true
+            type: boolean
+        type: object
+    type: object
+  app_group:
+    default: ''
+    examples:
+    - ''
+    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  sub-domain:
+    default: files
+    examples:
+    - files
+    type: string
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  apps:
+    default:
+      audioplayer: false
+      bookmarks: false
+      bpm: false
+      calendar: false
+      collabora: false
+      contacts: false
+      deck: false
+      groupfolders: true
+      mindmap: false
+      music: false
+      notes: false
+      onlyoffice: false
+      passman: false
+      spreed: false
+      tables: false
+      tasks: false
+      texteditor: true
+    examples:
+    - audioplayer: false
+      bookmarks: false
+      bpm: false
+      calendar: false
+      collabora: false
+      contacts: false
+      deck: false
+      groupfolders: true
+      mindmap: false
+      music: false
+      notes: false
+      onlyoffice: false
+      passman: false
+      spreed: false
+      tables: false
+      tasks: false
+      texteditor: true
+    properties:
+      audioplayer:
+        default: false
+        type: boolean
+      bookmarks:
+        default: false
+        type: boolean
+      bpm:
+        default: false
+        type: boolean
+      calendar:
+        default: false
+        type: boolean
+      collabora:
+        default: false
+        type: boolean
+      contacts:
+        default: false
+        type: boolean
+      deck:
+        default: false
+        type: boolean
+      groupfolders:
+        default: true
+        type: boolean
+      mindmap:
+        default: false
+        type: boolean
+      music:
+        default: false
+        type: boolean
+      notes:
+        default: false
+        type: boolean
+      onlyoffice:
+        default: false
+        type: boolean
+      passman:
+        default: false
+        type: boolean
+      spreed:
+        default: false
+        type: boolean
+      tables:
+        default: false
+        type: boolean
+      tasks:
+        default: false
+        type: boolean
+      texteditor:
+        default: true
+        type: boolean
+    type: object
 dependencies:
 - dist: null
   category: share

apps/nextcloud/presentation.tf

@@ -59,6 +59,7 @@ module "oauth2" {
   component         = var.component
   instance          = var.instance
   namespace         = var.namespace
+  domain            = var.domain
   labels            = local.common-labels
   dns_name          = local.dns_name
   redirect_path     = "apps/user_oidc/code"

modules/ingress/ingress.tf

@@ -34,7 +34,7 @@ resource "kubectl_manifest" "prj_certificate" {
 }
 
 resource "kubectl_manifest" "prj_https_redirect" {
-  count = var.create-redirect||var.component==""?1:0
+  count = var.create_redirect||var.component==""?1:0
   yaml_body  = <<-EOF
     apiVersion: "traefik.containo.us/v1alpha1"
     kind: "Middleware"

modules/ingress/variables.tf

@@ -27,7 +27,7 @@ variable "middlewares" {
 variable "service" {
 }
 
-variable "create-redirect" {
+variable "create_redirect" {
   type        = bool
   default     = false
 }

monitor/grafana/index.yaml

@@ -108,16 +108,6 @@ options:
             type: string
         type: object
     type: object
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  app_group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
   issuer:
     default: letsencrypt-prod
     examples:
@@ -128,28 +118,23 @@ options:
     examples:
     - grafana
     type: string
-  domain_name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
   storage:
     default:
       volume:
         accessMode: ReadWriteOnce
-        size: 1Gi
+        size: 10Gi
         type: Filesystem
     description: Configure this app storage
     examples:
     - volume:
         accessMode: ReadWriteOnce
-        size: 1Gi
+        size: 10Gi
         type: Filesystem
     properties:
       volume:
         default:
           accessMode: ReadWriteOnce
-          size: 1Gi
+          size: 10Gi
           type: Filesystem
         properties:
           accessMode:
@@ -160,7 +145,7 @@ options:
             - ReadWriteMany
             type: string
           size:
-            default: 1Gi
+            default: 10Gi
             type: string
           type:
             default: Filesystem
@@ -170,11 +155,26 @@ options:
             type: string
         type: object
     type: object
+  app_group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   admin_name:
     default: grafana_admin
     examples:
     - grafana_admin
     type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
 dependencies: []
 providers:
   kubernetes: true

monitor/grafana/v1_PersistentVolumeClaim_grafana.yaml

@@ -17,4 +17,4 @@ spec:
     - "ReadWriteOnce"
   resources:
     requests:
-      storage: 10Gi
+      storage: "10Gi"

share/dataset-pg/directus.tf

@@ -219,7 +219,7 @@ module "directus-ingress" {
   ingress_class     = var.ingress_class
   labels            = local.directus-labels
   dns_names         = [local.directus-dns_name]
-  create-redirect   = true
+  create_redirect   = true
   middlewares       = []
   services          = [local.directus-service]
   providers = {

share/dataset-pg/index.yaml

@@ -6,10 +6,41 @@ metadata:
   name: dataset-pg
   description: null
 options:
-  domain_name:
+  storage:
-    default: your_company.com
+    default:
+      postgres:
+        size: 10Gi
     examples:
-    - your_company.com
+    - postgres:
+        size: 10Gi
+    properties:
+      postgres:
+        default:
+          size: 10Gi
+        properties:
+          size:
+            default: 10Gi
+            type: string
+        type: object
+    type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  roles:
+    default: []
+    items:
+      properties:
+        name:
+          default: alt-account
+          type: string
+      type: object
+    type: array
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
     type: string
   images:
     default:
@@ -40,57 +71,6 @@ options:
             type: number
         type: object
     type: object
-  postgres:
-    default:
-      replicas: 1
-    examples:
-    - replicas: 1
-    properties:
-      replicas:
-        default: 1
-        type: integer
-    type: object
-  app_group:
-    default: api
-    examples:
-    - api
-    type: string
-  roles:
-    default: []
-    items:
-      properties:
-        name:
-          default: alt-account
-          type: string
-      type: object
-    type: array
-  storage:
-    default:
-      postgres:
-        size: 10Gi
-    examples:
-    - postgres:
-        size: 10Gi
-    properties:
-      postgres:
-        default:
-          size: 10Gi
-        properties:
-          size:
-            default: 10Gi
-            type: string
-        type: object
-    type: object
-  sub-domain:
-    default: dataset-pg
-    examples:
-    - dataset-pg
-    type: string
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
   extentions:
     default:
       directus:
@@ -272,15 +252,10 @@ options:
             type: object
         type: object
     type: object
-  issuer:
+  app_group:
-    default: letsencrypt-prod
+    default: api
     examples:
-    - letsencrypt-prod
+    - api
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
     type: string
   backups:
     default:
@@ -345,6 +320,31 @@ options:
           type: string
       type: object
     type: array
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  postgres:
+    default:
+      replicas: 1
+    examples:
+    - replicas: 1
+    properties:
+      replicas:
+        default: 1
+        type: integer
+    type: object
+  sub-domain:
+    default: dataset-pg
+    examples:
+    - dataset-pg
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
 dependencies:
 - dist: null
   category: dbo

share/dataset-pg/postgrest.tf

@@ -155,7 +155,7 @@ module "postgrest-ingress" {
   ingress_class     = var.ingress_class
   labels            = local.prest-labels
   dns_names         = [local.prest-dns_name]
-  create-redirect   = true
+  create_redirect   = true
   middlewares       = []
   sub_paths         = ["ui",""]
   services          = [local.swagger-service, local.prest-service]