fix

2024-01-26 11:14:00 +01:00
parent 0c5e247c0c
commit a0addbd842
91 changed files with 2236 additions and 2236 deletions
--- a/meta/domain-apps/apps.tf
+++ b/meta/domain-apps/apps.tf
@@ -2,15 +2,15 @@ locals {
    annotations = {
      "vynil.solidite.fr/meta" = var.component
      "vynil.solidite.fr/name" = "${var.namespace}-auth"
-      "vynil.solidite.fr/domain" = var.domain-name
+      "vynil.solidite.fr/domain" = var.domain_name
      "vynil.solidite.fr/issuer" = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
+      "vynil.solidite.fr/ingress" = var.ingress_class
    }
    global = {
        "domain"        = var.namespace
-        "domain-name"   = var.domain-name
+        "domain_name"   = var.domain_name
        "issuer"        = var.issuer
-        "ingress-class" = var.ingress-class
+        "ingress_class" = var.ingress_class
        "backups"       = var.backups
    }
    default-mode = var.storage-classes.FilesystemReadWriteMany!=""?"ReadWriteMany":"ReadWriteOnce"
--- a/meta/domain-apps/index.yaml
+++ b/meta/domain-apps/index.yaml
@@ -6,23 +6,11 @@ metadata:
  name: domain-apps
  description: null
 options:
-  domain-name:
-    default: your_company.com
+  domain:
+    default: your-company
    examples:
-    - your_company.com
+    - your-company
    type: string
-  nextcloud:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: nextcloud
  distributions:
    default:
      core: core
@@ -38,6 +26,58 @@ options:
        default: domain
        type: string
    type: object
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
+  nextcloud:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: nextcloud
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
  backups:
    default:
      enable: false
@@ -68,46 +108,6 @@ options:
        default: backup-settings
        type: string
    type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  storage-classes:
-    default:
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    examples:
-    - BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    properties:
-      BlockReadWriteMany:
-        default: ''
-        type: string
-      BlockReadWriteOnce:
-        default: ''
-        type: string
-      FilesystemReadWriteMany:
-        default: ''
-        type: string
-      FilesystemReadWriteOnce:
-        default: ''
-        type: string
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-auth/apps.tf
+++ b/meta/domain-auth/apps.tf
@@ -2,15 +2,15 @@ locals {
    annotations = {
      "vynil.solidite.fr/meta"    = var.component
      "vynil.solidite.fr/name"    = "${var.namespace}-auth"
-      "vynil.solidite.fr/domain"  = var.domain-name
+      "vynil.solidite.fr/domain"  = var.domain_name
      "vynil.solidite.fr/issuer"  = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
+      "vynil.solidite.fr/ingress" = var.ingress_class
    }
    global = {
        "domain"        = var.namespace
-        "domain-name"   = var.domain-name
+        "domain_name"   = var.domain_name
        "issuer"        = var.issuer
-        "ingress-class" = var.ingress-class
+        "ingress_class" = var.ingress_class
        "backups"       = var.backups
    }
    authentik = { for k, v in var.authentik : k => v if k!="enable" }
--- a/meta/domain-auth/index.yaml
+++ b/meta/domain-auth/index.yaml
@@ -6,6 +6,91 @@ metadata:
  name: domain-auth
  description: null
 options:
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
+  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
+  authentik:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+  clients:
+    default:
+      apps: []
+      divisions: []
+      enable: false
+    examples:
+    - apps: []
+      divisions: []
+      enable: false
+    properties:
+      apps:
+        default: []
+        items:
+          type: string
+        type: array
+      divisions:
+        default: []
+        items:
+          properties:
+            apps:
+              items:
+                type: string
+              type: array
+            name:
+              type: string
+            teams:
+              items:
+                type: object
+              type: array
+          type: object
+        type: array
+      enable:
+        default: false
+        type: boolean
+    type: object
+  authentik-ldap:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
  fournisseurs:
    default:
      apps: []
@@ -66,35 +151,15 @@ options:
        default: ''
        type: string
    type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  authentik:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  clients:
+  employes:
    default:
      apps: []
      divisions: []
-      enable: false
+      enable: true
    examples:
    - apps: []
      divisions: []
-      enable: false
+      enable: true
    properties:
      apps:
        default: []
@@ -118,28 +183,18 @@ options:
          type: object
        type: array
      enable:
-        default: false
+        default: true
        type: boolean
    type: object
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  distributions:
+  authentik-forward:
    default:
-      core: core
-      domain: domain
+      enable: false
    examples:
-    - core: core
-      domain: domain
+    - enable: false
    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
+      enable:
+        default: false
+        type: boolean
    type: object
  issuer:
    default: letsencrypt-prod
@@ -176,61 +231,6 @@ options:
        default: backup-settings
        type: string
    type: object
-  authentik-forward:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-  authentik-ldap:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-  employes:
-    default:
-      apps: []
-      divisions: []
-      enable: true
-    examples:
-    - apps: []
-      divisions: []
-      enable: true
-    properties:
-      apps:
-        default: []
-        items:
-          type: string
-        type: array
-      divisions:
-        default: []
-        items:
-          properties:
-            apps:
-              items:
-                type: string
-              type: array
-            name:
-              type: string
-            teams:
-              items:
-                type: object
-              type: array
-          type: object
-        type: array
-      enable:
-        default: true
-        type: boolean
-    type: object
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-ci/apps.tf
+++ b/meta/domain-ci/apps.tf
@@ -2,15 +2,15 @@ locals {
    annotations = {
      "vynil.solidite.fr/meta"    = var.component
      "vynil.solidite.fr/name"    = var.namespace
-      "vynil.solidite.fr/domain"  = var.domain-name
+      "vynil.solidite.fr/domain"  = var.domain_name
      "vynil.solidite.fr/issuer"  = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
+      "vynil.solidite.fr/ingress" = var.ingress_class
    }
    global = {
        "domain"         = var.namespace
-        "domain-name"    = var.domain-name
+        "domain_name"    = var.domain_name
        "issuer"         = var.issuer
-        "ingress-class"  = var.ingress-class
+        "ingress_class"  = var.ingress_class
        "backups"        = var.backups
    }
    default-mode = var.storage-classes.FilesystemReadWriteMany!=""?"ReadWriteMany":"ReadWriteOnce"
--- a/meta/domain-ci/index.yaml
+++ b/meta/domain-ci/index.yaml
@@ -11,12 +11,18 @@ options:
    examples:
    - your-company
    type: string
-  issuer:
-    default: letsencrypt-prod
+  gitea:
+    default:
+      enable: true
    examples:
-    - letsencrypt-prod
-    type: string
-    x-vynil-enum-source: issuer
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: gitea
  distributions:
    default:
      core: core
@@ -32,6 +38,59 @@ options:
        default: domain
        type: string
    type: object
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+    x-vynil-enum-source: issuer
+  woodpecker:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: woodpecker
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
  backups:
    default:
      enable: false
@@ -62,65 +121,6 @@ options:
        default: backup-settings
        type: string
    type: object
-  gitea:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: gitea
-  woodpecker:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: woodpecker
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  storage-classes:
-    default:
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    examples:
-    - BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    properties:
-      BlockReadWriteMany:
-        default: ''
-        type: string
-      BlockReadWriteOnce:
-        default: ''
-        type: string
-      FilesystemReadWriteMany:
-        default: ''
-        type: string
-      FilesystemReadWriteOnce:
-        default: ''
-        type: string
-    type: object
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-devspaces/apps.tf
+++ b/meta/domain-devspaces/apps.tf
@@ -2,21 +2,21 @@ locals {
    annotations = {
      "vynil.solidite.fr/meta" = var.component
      "vynil.solidite.fr/name" = "${var.domain}-devspaces"
-      "vynil.solidite.fr/domain" = var.domain-name
+      "vynil.solidite.fr/domain" = var.domain_name
      "vynil.solidite.fr/issuer" = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
+      "vynil.solidite.fr/ingress" = var.ingress_class
    }
    global = {
        "domain"         = var.domain
-        "domain-name"    = var.domain-name
+        "domain_name"    = var.domain_name
        "issuer"         = var.issuer
-        "ingress-class"  = var.ingress-class
+        "ingress_class"  = var.ingress_class
        "backups"        = var.backups
-        "app-group"      = var.app-group
+        "app_group"      = var.app_group
    }
    global-apps = merge(local.global, {
-      "domain-name"    = "devtools.${var.domain-name}"
-      "app-group"      = "dev"
+      "domain_name"    = "devtools.${var.domain_name}"
+      "app_group"      = "dev"
    })
    okd = merge({
      "namespaces" = concat([
--- a/meta/domain-devspaces/index.yaml
+++ b/meta/domain-devspaces/index.yaml
@@ -11,6 +11,70 @@ options:
    examples:
    - your-company
    type: string
+  external-pgs:
+    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
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    examples:
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      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
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
  issuer:
    default: letsencrypt-prod
    examples:
@@ -57,249 +121,6 @@ options:
          type: array
      type: object
    type: array
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
-    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      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
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-    type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  stations-sub-domain:
-    default: code
-    examples:
-    - code
-    type: string
-  external-marias:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        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
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  external-pgs:
-    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
-  external-redis:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        namespace:
-          default: ''
-          type: string
-      type: object
-    type: array
-  external-mongos:
-    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
-  storage-classes:
-    default:
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    examples:
-    - BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    properties:
-      BlockReadWriteMany:
-        default: ''
-        type: string
-      BlockReadWriteOnce:
-        default: ''
-        type: string
-      FilesystemReadWriteMany:
-        default: ''
-        type: string
-      FilesystemReadWriteOnce:
-        default: ''
-        type: string
-    type: object
-  images:
-    default:
-      codeserver:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: sebt3/code-server
-        tag: 4.18
-    examples:
-    - codeserver:
-        pullPolicy: IfNotPresent
-        registry: docker.io
-        repository: sebt3/code-server
-        tag: 4.18
-    properties:
-      codeserver:
-        default:
-          pullPolicy: IfNotPresent
-          registry: docker.io
-          repository: sebt3/code-server
-          tag: 4.18
-        properties:
-          pullPolicy:
-            default: IfNotPresent
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-          registry:
-            default: docker.io
-            type: string
-          repository:
-            default: sebt3/code-server
-            type: string
-          tag:
-            default: 4.18
-            type: number
-        type: object
-    type: object
-  stations:
-    default: []
-    examples:
-    - []
-    items:
-      properties:
-        name:
-          default: ''
-          type: string
-        organisations:
-          default: []
-          items:
-            type: string
-          type: array
-      type: object
-    type: array
  apps:
    default:
      dbgate:
@@ -376,6 +197,185 @@ options:
    examples:
    - false
    type: boolean
+  stations:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        organisations:
+          default: []
+          items:
+            type: string
+          type: array
+      type: object
+    type: array
+  external-marias:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        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
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
+  images:
+    default:
+      codeserver:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: sebt3/code-server
+        tag: 4.18
+    examples:
+    - codeserver:
+        pullPolicy: IfNotPresent
+        registry: docker.io
+        repository: sebt3/code-server
+        tag: 4.18
+    properties:
+      codeserver:
+        default:
+          pullPolicy: IfNotPresent
+          registry: docker.io
+          repository: sebt3/code-server
+          tag: 4.18
+        properties:
+          pullPolicy:
+            default: IfNotPresent
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+          registry:
+            default: docker.io
+            type: string
+          repository:
+            default: sebt3/code-server
+            type: string
+          tag:
+            default: 4.18
+            type: number
+        type: object
+    type: object
+  external-mongos:
+    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
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  stations-sub-domain:
+    default: code
+    examples:
+    - code
+    type: string
+  app_group:
+    default: dev
+    examples:
+    - dev
+    type: string
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
+  external-redis:
+    default: []
+    examples:
+    - []
+    items:
+      properties:
+        name:
+          default: ''
+          type: string
+        namespace:
+          default: ''
+          type: string
+      type: object
+    type: array
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-erp/apps.tf
+++ b/meta/domain-erp/apps.tf
@@ -2,18 +2,18 @@ locals {
    annotations = {
      "vynil.solidite.fr/meta"   = var.component
      "vynil.solidite.fr/name"   = var.namespace
-      "vynil.solidite.fr/domain" = var.domain-name
+      "vynil.solidite.fr/domain" = var.domain_name
      "vynil.solidite.fr/issuer" = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
+      "vynil.solidite.fr/ingress" = var.ingress_class
    }
    annotations_default = {
-      "default.vynil.solidite.fr/domain_name" = var.domain-name
+      "default.vynil.solidite.fr/domain_name" = var.domain_name
    }
    global = {
        "domain"        = var.namespace
-        "domain-name"   = var.domain-name
+        "domain_name"   = var.domain_name
        "issuer"        = var.issuer
-        "ingress-class" = var.ingress-class
+        "ingress_class" = var.ingress_class
        "backups"       = var.backups
    }
    default-mode = var.storage-classes.FilesystemReadWriteMany!=""?"ReadWriteMany":"ReadWriteOnce"
--- a/meta/domain-erp/index.yaml
+++ b/meta/domain-erp/index.yaml
@@ -6,6 +6,26 @@ metadata:
  name: domain-erp
  description: null
 options:
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
  storage-classes:
    default:
      BlockReadWriteMany: ''
@@ -31,33 +51,11 @@ options:
        default: ''
        type: string
    type: object
-  dolibarr:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: dolibarr
-  ingress-class:
+  ingress_class:
    default: traefik
    examples:
    - traefik
    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
  backups:
    default:
      enable: false
@@ -88,26 +86,28 @@ options:
        default: backup-settings
        type: string
    type: object
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
  issuer:
    default: letsencrypt-prod
    examples:
    - letsencrypt-prod
    type: string
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  dolibarr:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: dolibarr
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-infra/apps.tf
+++ b/meta/domain-infra/apps.tf
@@ -2,17 +2,17 @@ locals {
    annotations = {
      "vynil.solidite.fr/meta"   = "domain-ci"
      "vynil.solidite.fr/name"   = var.namespace
-      "vynil.solidite.fr/domain" = var.domain-name
+      "vynil.solidite.fr/domain" = var.domain_name
      "vynil.solidite.fr/issuer" = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
+      "vynil.solidite.fr/ingress" = var.ingress_class
    }
    global = {
        "domain"        = var.namespace
-        "domain-name"   = "admin.${var.domain-name}"
+        "domain_name"   = "admin.${var.domain_name}"
        "issuer"        = var.issuer
-        "ingress-class" = var.ingress-class
+        "ingress_class" = var.ingress_class
        "backups"       = var.backups
-        "app-group"     = var.app-group
+        "app_group"     = var.app_group
    }
    traefik = { for k, v in var.traefik : k => v if k!="enable" }
    dns = { for k, v in var.dns : k => v if k!="enable" }
--- a/meta/domain-infra/index.yaml
+++ b/meta/domain-infra/index.yaml
@@ -6,7 +6,7 @@ metadata:
  name: domain-infra
  description: null
 options:
-  dns:
+  okd:
    default:
      enable: false
    examples:
@@ -16,55 +16,25 @@ options:
        default: false
        type: boolean
    type: object
-    x-vynil-category: share
-    x-vynil-package: dns
-  api:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-  traefik:
-    default:
-      enable: false
-      namespace: traefik
-    examples:
-    - enable: false
-      namespace: traefik
-    properties:
-      enable:
-        default: false
-        type: boolean
-      namespace:
-        default: traefik
-        type: string
-    type: object
    x-vynil-category: apps
-    x-vynil-package: traefix-ui
-  app-group:
-    default: infra
-    examples:
-    - infra
-    type: string
-  distributions:
+    x-vynil-package: okd
+  gramo:
    default:
-      core: core
-      domain: domain
+      enable: false
    examples:
-    - core: core
-      domain: domain
+    - enable: false
    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
+      enable:
+        default: false
+        type: boolean
    type: object
+    x-vynil-category: apps
+    x-vynil-package: gramo
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
  storage-classes:
    default:
      BlockReadWriteMany: ''
@@ -90,45 +60,23 @@ options:
        default: ''
        type: string
    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  okd:
+  traefik:
    default:
      enable: false
+      namespace: traefik
    examples:
    - enable: false
+      namespace: traefik
    properties:
      enable:
        default: false
        type: boolean
+      namespace:
+        default: traefik
+        type: string
    type: object
    x-vynil-category: apps
-    x-vynil-package: okd
-  gramo:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: gramo
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
+    x-vynil-package: traefix-ui
  backups:
    default:
      enable: false
@@ -159,11 +107,63 @@ options:
        default: backup-settings
        type: string
    type: object
-  ingress-class:
+  api:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  app_group:
+    default: infra
+    examples:
+    - infra
+    type: string
+  dns:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: share
+    x-vynil-package: dns
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
+  ingress_class:
    default: traefik
    examples:
    - traefik
    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-mail/apps.tf
+++ b/meta/domain-mail/apps.tf
@@ -2,15 +2,15 @@ locals {
    annotations = {
      "vynil.solidite.fr/meta"   = var.component
      "vynil.solidite.fr/name"   = var.namespace
-      "vynil.solidite.fr/domain" = var.domain-name
+      "vynil.solidite.fr/domain" = var.domain_name
      "vynil.solidite.fr/issuer" = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
+      "vynil.solidite.fr/ingress" = var.ingress_class
    }
    global = {
        "domain"        = var.namespace
-        "domain-name"   = var.domain-name
+        "domain_name"   = var.domain_name
        "issuer"        = var.issuer
-        "ingress-class" = var.ingress-class
+        "ingress_class" = var.ingress_class
        "backups"       = var.backups
    }
    wildduck = { for k, v in var.wildduck : k => v if k!="enable" }
--- a/meta/domain-mail/index.yaml
+++ b/meta/domain-mail/index.yaml
@@ -6,41 +6,16 @@ metadata:
  name: domain-mail
  description: null
 options:
-  storage-classes:
-    default:
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
+  domain_name:
+    default: your_company.com
    examples:
-    - BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-    properties:
-      BlockReadWriteMany:
-        default: ''
-        type: string
-      BlockReadWriteOnce:
-        default: ''
-        type: string
-      FilesystemReadWriteMany:
-        default: ''
-        type: string
-      FilesystemReadWriteOnce:
-        default: ''
-        type: string
-    type: object
-  wildduck:
-    default:
-      enable: true
+    - your_company.com
+    type: string
+  issuer:
+    default: letsencrypt-prod
    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
+    - letsencrypt-prod
+    type: string
  distributions:
    default:
      core: core
@@ -56,26 +31,11 @@ options:
        default: domain
        type: string
    type: object
-  ingress-class:
+  ingress_class:
    default: traefik
    examples:
    - traefik
    type: string
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
  backups:
    default:
      enable: false
@@ -106,6 +66,46 @@ options:
        default: backup-settings
        type: string
    type: object
+  wildduck:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+  storage-classes:
+    default:
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    examples:
+    - BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+    properties:
+      BlockReadWriteMany:
+        default: ''
+        type: string
+      BlockReadWriteOnce:
+        default: ''
+        type: string
+      FilesystemReadWriteMany:
+        default: ''
+        type: string
+      FilesystemReadWriteOnce:
+        default: ''
+        type: string
+    type: object
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain-monitor/apps.tf
+++ b/meta/domain-monitor/apps.tf
@@ -2,17 +2,17 @@ locals {
    annotations = {
      "vynil.solidite.fr/meta"   = "domain-monitor"
      "vynil.solidite.fr/name"   = var.namespace
-      "vynil.solidite.fr/domain" = var.domain-name
+      "vynil.solidite.fr/domain" = var.domain_name
      "vynil.solidite.fr/issuer" = var.issuer
-      "vynil.solidite.fr/ingress" = var.ingress-class
+      "vynil.solidite.fr/ingress" = var.ingress_class
    }
    global = {
        "domain"        = var.namespace
-        "domain-name"   = "monitor.${var.domain-name}"
+        "domain_name"   = "monitor.${var.domain_name}"
        "issuer"        = var.issuer
-        "ingress-class" = var.ingress-class
+        "ingress_class" = var.ingress_class
        "backups"       = var.backups
-        "app-group"     = var.app-group
+        "app_group"     = var.app_group
    }
    grafana = { for k, v in var.grafana : k => v if k!="enable" }
    prometheus = { for k, v in var.prometheus : k => v if k!="enable" }
--- a/meta/domain-monitor/index.yaml
+++ b/meta/domain-monitor/index.yaml
@@ -6,18 +6,6 @@ metadata:
  name: domain-monitor
  description: null
 options:
-  dashboards-workload:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: dashboards-workload
  loki:
    default:
      enable: true
@@ -30,7 +18,7 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: loki
-  dashboards-minimal:
+  dashboards-workload:
    default:
      enable: true
    examples:
@@ -41,12 +29,7 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: dashboards-minimal
-  app-group:
-    default: monitor
-    examples:
-    - monitor
-    type: string
+    x-vynil-package: dashboards-workload
  node-exporter:
    default:
      enable: true
@@ -59,35 +42,23 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: node-exporter
-  grafana:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: grafana
-  dashboards-cluster:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: dashboards-cluster
  domain:
    default: your-company
    examples:
    - your-company
    type: string
+  alertmanager:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: alertmanager
  alerts-containers:
    default:
      enable: true
@@ -112,30 +83,6 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: prometheus
-  alertmanager:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: alertmanager
-  promtail:
-    default:
-      enable: true
-    examples:
-    - enable: true
-    properties:
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: monitor
-    x-vynil-package: promtail
  storage-classes:
    default:
      BlockReadWriteMany: ''
@@ -161,7 +108,17 @@ options:
        default: ''
        type: string
    type: object
-  alerts-core:
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  app_group:
+    default: monitor
+    examples:
+    - monitor
+    type: string
+  promtail:
    default:
      enable: true
    examples:
@@ -172,19 +129,24 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: alerts-core
-  monitor-control-plan:
-    default:
-      enable: false
+    x-vynil-package: promtail
+  domain_name:
+    default: your_company.com
    examples:
-    - enable: false
+    - your_company.com
+    type: string
+  grafana:
+    default:
+      enable: true
+    examples:
+    - enable: true
    properties:
      enable:
-        default: false
+        default: true
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: monitor-control-plan
+    x-vynil-package: grafana
  backups:
    default:
      enable: false
@@ -220,6 +182,42 @@ options:
    examples:
    - letsencrypt-prod
    type: string
+  kube-state-metrics:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: kube-state-metrics
+  monitor-control-plan:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: monitor-control-plan
+  dashboards-minimal:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: dashboards-minimal
  dashboards-namespace:
    default:
      enable: true
@@ -232,6 +230,18 @@ options:
    type: object
    x-vynil-category: monitor
    x-vynil-package: dashboards-namespace
+  dashboards-cluster:
+    default:
+      enable: true
+    examples:
+    - enable: true
+    properties:
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: monitor
+    x-vynil-package: dashboards-cluster
  distributions:
    default:
      core: core
@@ -247,12 +257,7 @@ options:
        default: domain
        type: string
    type: object
-  ingress-class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  kube-state-metrics:
+  alerts-core:
    default:
      enable: true
    examples:
@@ -263,12 +268,7 @@ options:
        type: boolean
    type: object
    x-vynil-category: monitor
-    x-vynil-package: kube-state-metrics
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
+    x-vynil-package: alerts-core
 dependencies: []
 providers:
  kubernetes: true
--- a/meta/domain/index.yaml
+++ b/meta/domain/index.yaml
@@ -6,57 +6,6 @@ metadata:
  name: domain
  description: null
 options:
-  domain-name:
-    default: your_company.com
-    examples:
-    - your_company.com
-    type: string
-  apps:
-    default:
-      enable: false
-      nextcloud:
-        enable: true
-    examples:
-    - enable: false
-      nextcloud:
-        enable: true
-    properties:
-      enable:
-        default: false
-        type: boolean
-      nextcloud:
-        default:
-          enable: true
-        properties:
-          enable:
-            default: true
-            type: boolean
-        type: object
-    type: object
-    x-vynil-category: meta
-    x-vynil-package: domain-apps
-  mail:
-    default:
-      enable: false
-      wildduck:
-        enable: true
-    examples:
-    - enable: false
-      wildduck:
-        enable: true
-    properties:
-      enable:
-        default: false
-        type: boolean
-      wildduck:
-        default:
-          enable: true
-        properties:
-          enable:
-            default: true
-            type: boolean
-        type: object
-    type: object
  storage-classes:
    default:
      BlockReadWriteMany: ''
@@ -82,50 +31,6 @@ options:
        default: ''
        type: string
    type: object
-  auth:
-    default:
-      authentik:
-        enable: true
-      enable: true
-    examples:
-    - authentik:
-        enable: true
-      enable: true
-    properties:
-      authentik:
-        default:
-          enable: true
-        properties:
-          enable:
-            default: true
-            type: boolean
-        type: object
-      enable:
-        default: true
-        type: boolean
-    type: object
-    x-vynil-category: meta
-    x-vynil-package: domain-auth
-  distributions:
-    default:
-      core: core
-      domain: domain
-    examples:
-    - core: core
-      domain: domain
-    properties:
-      core:
-        default: core
-        type: string
-      domain:
-        default: domain
-        type: string
-    type: object
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
  infra:
    default:
      enable: false
@@ -150,12 +55,31 @@ options:
    type: object
    x-vynil-category: meta
    x-vynil-package: domain-infra
-  ingress-class:
-    default: traefik
+  apps:
+    default:
+      enable: false
+      nextcloud:
+        enable: true
    examples:
-    - traefik
-    type: string
-  devspaces:
+    - enable: false
+      nextcloud:
+        enable: true
+    properties:
+      enable:
+        default: false
+        type: boolean
+      nextcloud:
+        default:
+          enable: true
+        properties:
+          enable:
+            default: true
+            type: boolean
+        type: object
+    type: object
+    x-vynil-category: meta
+    x-vynil-package: domain-apps
+  monitor:
    default:
      enable: false
    examples:
@@ -166,7 +90,108 @@ options:
        type: boolean
    type: object
    x-vynil-category: meta
-    x-vynil-package: domain-devspaces
+    x-vynil-package: domain-monitor
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      secret-key: s3-secret
+      secret-name: backup-settings
+    examples:
+    - enable: false
+      endpoint: ''
+      key-id-key: s3-id
+      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
+      secret-key:
+        default: s3-secret
+        type: string
+      secret-name:
+        default: backup-settings
+        type: string
+    type: object
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  domain_name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
+  distributions:
+    default:
+      core: core
+      domain: domain
+    examples:
+    - core: core
+      domain: domain
+    properties:
+      core:
+        default: core
+        type: string
+      domain:
+        default: domain
+        type: string
+    type: object
+  mail:
+    default:
+      enable: false
+      wildduck:
+        enable: true
+    examples:
+    - enable: false
+      wildduck:
+        enable: true
+    properties:
+      enable:
+        default: false
+        type: boolean
+      wildduck:
+        default:
+          enable: true
+        properties:
+          enable:
+            default: true
+            type: boolean
+        type: object
+    type: object
+  auth:
+    default:
+      authentik:
+        enable: true
+      enable: true
+    examples:
+    - authentik:
+        enable: true
+      enable: true
+    properties:
+      authentik:
+        default:
+          enable: true
+        properties:
+          enable:
+            default: true
+            type: boolean
+        type: object
+      enable:
+        default: true
+        type: boolean
+    type: object
+    x-vynil-category: meta
+    x-vynil-package: domain-auth
  ci:
    default:
      enable: false
@@ -215,7 +240,7 @@ options:
    type: object
    x-vynil-category: meta
    x-vynil-package: domain-erp
-  monitor:
+  devspaces:
    default:
      enable: false
    examples:
@@ -226,37 +251,12 @@ options:
        type: boolean
    type: object
    x-vynil-category: meta
-    x-vynil-package: domain-monitor
-  backups:
-    default:
-      enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      secret-key: s3-secret
-      secret-name: backup-settings
+    x-vynil-package: domain-devspaces
+  issuer:
+    default: letsencrypt-prod
    examples:
-    - enable: false
-      endpoint: ''
-      key-id-key: s3-id
-      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
-      secret-key:
-        default: s3-secret
-        type: string
-      secret-name:
-        default: backup-settings
-        type: string
-    type: object
+    - letsencrypt-prod
+    type: string
 dependencies: []
 providers:
  kubernetes: null
--- a/meta/domain/installs.tf
+++ b/meta/domain/installs.tf
@@ -1,9 +1,9 @@
 locals {
  global = {
      "domain"         = var.namespace
-      "domain-name"    = var.domain-name
+      "domain_name"    = var.domain_name
      "issuer"         = var.issuer
-      "ingress-class"  = var.ingress-class
+      "ingress_class"  = var.ingress_class
      "distributions"  = var.distributions
      "backups"        = var.backups
      "storage-classes"= var.storage-classes
@@ -11,9 +11,9 @@ locals {
  annotations = {
    "vynil.solidite.fr/meta" = var.component
    "vynil.solidite.fr/name" = var.namespace
-    "vynil.solidite.fr/domain" = var.domain-name
+    "vynil.solidite.fr/domain" = var.domain_name
    "vynil.solidite.fr/issuer" = var.issuer
-    "vynil.solidite.fr/ingress" = var.ingress-class
+    "vynil.solidite.fr/ingress" = var.ingress_class
  }
  auth = { for k, v in var.auth : k => v if k!="enable" }
  infra = { for k, v in var.infra : k => v if k!="enable" }