fix

2024-04-11 10:59:56 +02:00
parent 0ad9715154
commit c25e5e7718
18 changed files with 1116 additions and 1095 deletions
--- a/meta/domain-infra/apps.tf
+++ b/meta/domain-infra/apps.tf
@@ -46,33 +46,33 @@ locals {
      "class"      = var.storage.volume.class
    }
    traefik = merge(local.global,{ for k, v in var.traefik : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.traefik, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.traefik, "backups", {}))
      storage = merge({ for k, v in lookup(var.traefik, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.traefik, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.traefik, "storage", {}), "volume", {}))
      })
    })
    dns = merge(local.global,{ for k, v in var.dns : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.dns, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.dns, "backups", {}))
      storage = merge({ for k, v in lookup(var.dns, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.dns, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.dns, "storage", {}), "volume", {}))
      })
    })
    api = merge(local.global,{ for k, v in var.api : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.api, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.api, "backups", {}))
      storage = merge({ for k, v in lookup(var.api, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.api, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.api, "storage", {}), "volume", {}))
      })
    })
    okd = merge({"cluster-admin" = true}, local.global,{ for k, v in var.okd : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.okd, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.okd, "backups", {}))
      storage = merge({ for k, v in lookup(var.okd, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.okd, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.okd, "storage", {}), "volume", {}))
      })
    })
    gramo = merge({"cluster-admin" = true}, local.global,{ for k, v in var.gramo : k => v if !contains(["enable","storage","backups"],k) },{
-      backups = merge(lookup(var.gramo, "backups", {}), local.global-backups)
+      backups = merge(local.global-backups, lookup(var.gramo, "backups", {}))
      storage = merge({ for k, v in lookup(var.gramo, "storage", {}) : k => v if !contains(["volume"],k) }, {
-        volume = merge(lookup(lookup(var.gramo, "storage", {}), "volume", {}), local.global-volume)
+        volume = merge(local.global-volume, lookup(lookup(var.gramo, "storage", {}), "volume", {}))
      })
    })
 }
--- a/meta/domain-infra/index.yaml
+++ b/meta/domain-infra/index.yaml
@@ -6,46 +6,6 @@ metadata:
  name: domain-infra
  description: null
 options:
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
-  storage:
-    default:
-      volume:
-        accessMode: ReadWriteOnce
-        class: ''
-    examples:
-    - volume:
-        accessMode: ReadWriteOnce
-        class: ''
-    properties:
-      volume:
-        default:
-          accessMode: ReadWriteOnce
-          class: ''
-        properties:
-          accessMode:
-            default: ReadWriteOnce
-            type: string
-          class:
-            default: ''
-            type: string
-        type: object
-    type: object
-  gramo:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: gramo
  api:
    default:
      enable: false
@@ -56,59 +16,10 @@ options:
        default: false
        type: boolean
    type: object
-  dns:
-    default:
-      enable: false
+  app_group:
+    default: infra
    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: share
-    x-vynil-package: dns
-  sso_vynil:
-    default: true
-    examples:
-    - true
-    type: boolean
-  domain:
-    default: your-company
-    examples:
-    - your-company
-    type: string
-  timezone:
-    default: Europe/Paris
-    examples:
-    - Europe/Paris
-    type: string
-  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
-  ingress_class:
-    default: traefik
-    examples:
-    - traefik
-    type: string
-  language:
-    default: fr_FR
-    examples:
-    - fr_FR
+    - infra
    type: string
  backups:
    default:
@@ -150,28 +61,6 @@ options:
        default: false
        type: boolean
    type: object
-  okd:
-    default:
-      enable: false
-    examples:
-    - enable: false
-    properties:
-      enable:
-        default: false
-        type: boolean
-    type: object
-    x-vynil-category: apps
-    x-vynil-package: okd
-  app_group:
-    default: infra
-    examples:
-    - infra
-    type: string
-  domain_name:
-    default: your-company.com
-    examples:
-    - your-company.com
-    type: string
  distributions:
    default:
      core: core
@@ -187,12 +76,124 @@ options:
        default: domain
        type: string
    type: object
+  dns:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: share
+    x-vynil-package: dns
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
+  domain_name:
+    default: your-company.com
+    examples:
+    - your-company.com
+    type: string
+  gramo:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: gramo
+  ingress_class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  language:
+    default: fr_FR
+    examples:
+    - fr_FR
+    type: string
+  okd:
+    default:
+      enable: false
+    examples:
+    - enable: false
+    properties:
+      enable:
+        default: false
+        type: boolean
+    type: object
+    x-vynil-category: apps
+    x-vynil-package: okd
+  sso_vynil:
+    default: true
+    examples:
+    - true
+    type: boolean
+  storage:
+    default:
+      volume:
+        accessMode: ReadWriteOnce
+        class: ''
+    examples:
+    - volume:
+        accessMode: ReadWriteOnce
+        class: ''
+    properties:
+      volume:
+        default:
+          accessMode: ReadWriteOnce
+          class: ''
+        properties:
+          accessMode:
+            default: ReadWriteOnce
+            type: string
+          class:
+            default: ''
+            type: string
+        type: object
+    type: object
+  timezone:
+    default: Europe/Paris
+    examples:
+    - Europe/Paris
+    type: string
+  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
 dependencies: []
 providers:
  kubernetes: true
  authentik: null
  kubectl: true
  postgresql: null
+  mysql: null
  restapi: null
  http: null
  gitea: null