fix

meta/domain-devspaces/index.yaml

@@ -6,11 +6,26 @@ metadata:
   name: domain-devspaces
   description: null
 options:
+  ingress-class:
+    default: traefik
+    examples:
+    - traefik
+    type: string
   app-group:
     default: dev
     examples:
     - dev
     type: string
+  stations-sub-domain:
+    default: code
+    examples:
+    - code
+    type: string
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
   images:
     default:
       codeserver:
@@ -50,6 +65,108 @@ options:
         tag: 4.15
         pullPolicy: IfNotPresent
     type: object
+  backups:
+    default:
+      enable: false
+      endpoint: ''
+      secret-name: backup-settings
+      key-id-key: s3-id
+      secret-key: s3-secret
+    examples:
+    - enable: false
+      endpoint: ''
+      secret-name: backup-settings
+      key-id-key: s3-id
+      secret-key: s3-secret
+    type: object
+    properties:
+      enable:
+        type: boolean
+        default: false
+      endpoint:
+        type: string
+        default: ''
+      key-id-key:
+        type: string
+        default: s3-id
+      secret-key:
+        type: string
+        default: s3-secret
+      secret-name:
+        type: string
+        default: backup-settings
+  stations:
+    default: []
+    items:
+      type: object
+      properties:
+        name:
+          type: string
+          default: ''
+        organisations:
+          default: []
+          type: array
+          items:
+            type: string
+    examples:
+    - []
+    type: array
+  distributions:
+    default:
+      domain: domain
+      core: core
+    examples:
+    - domain: domain
+      core: core
+    type: object
+    properties:
+      core:
+        type: string
+        default: core
+      domain:
+        type: string
+        default: domain
+  apps:
+    default:
+      dbgate:
+        enable: false
+      superset:
+        enable: false
+      yaade:
+        enable: false
+    examples:
+    - dbgate:
+        enable: false
+      superset:
+        enable: false
+      yaade:
+        enable: false
+    type: object
+    properties:
+      dbgate:
+        type: object
+        properties:
+          enable:
+            type: boolean
+            default: false
+        default:
+          enable: false
+      superset:
+        type: object
+        properties:
+          enable:
+            type: boolean
+            default: false
+        default:
+          enable: false
+      yaade:
+        type: object
+        properties:
+          enable:
+            type: boolean
+            default: false
+        default:
+          enable: false
   external-databases:
     default: []
     items:
@@ -93,98 +210,16 @@ options:
     examples:
     - []
     type: array
-  backups:
+  domain-name:
-    default:
+    default: your_company.com
-      enable: false
-      endpoint: ''
-      secret-name: backup-settings
-      key-id-key: s3-id
-      secret-key: s3-secret
     examples:
-    - enable: false
+    - your_company.com
-      endpoint: ''
-      secret-name: backup-settings
-      key-id-key: s3-id
-      secret-key: s3-secret
-    type: object
-    properties:
-      enable:
-        type: boolean
-        default: false
-      endpoint:
-        type: string
-        default: ''
-      key-id-key:
-        type: string
-        default: s3-id
-      secret-key:
-        type: string
-        default: s3-secret
-      secret-name:
-        type: string
-        default: backup-settings
-  apps:
-    default:
-      dbgate:
-        enable: false
-      superset:
-        enable: false
-      yaade:
-        enable: false
-    examples:
-    - dbgate:
-        enable: false
-      superset:
-        enable: false
-      yaade:
-        enable: false
-    type: object
-    properties:
-      dbgate:
-        type: object
-        properties:
-          enable:
-            type: boolean
-            default: false
-        default:
-          enable: false
-      superset:
-        type: object
-        properties:
-          enable:
-            type: boolean
-            default: false
-        default:
-          enable: false
-      yaade:
-        type: object
-        properties:
-          enable:
-            type: boolean
-            default: false
-        default:
-          enable: false
-  stations-sub-domain:
-    default: code
-    examples:
-    - code
     type: string
-  stations:
+  domain:
-    default: []
+    default: your-company
-    items:
-      type: object
-      properties:
-        name:
-          type: string
-          default: ''
-        organisations:
-          default: []
-          type: array
-          items:
-            type: string
     examples:
-    - []
+    - your-company
-    type: array
+    type: string
   storage-classes:
     default:
       FilesystemReadWriteMany: ''
@@ -210,21 +245,6 @@ options:
       FilesystemReadWriteOnce:
         type: string
         default: ''
-  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
   organisations:
     default: []
     items:
@@ -248,26 +268,6 @@ options:
     examples:
     - []
     type: array
-  distributions:
-    default:
-      domain: domain
-      core: core
-    examples:
-    - domain: domain
-      core: core
-    type: object
-    properties:
-      core:
-        type: string
-        default: core
-      domain:
-        type: string
-        default: domain
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
 dependencies: []
 providers:
   kubernetes: true

meta/domain-devspaces/organisations.tf

@@ -9,7 +9,6 @@ locals {
 
 resource "kubectl_manifest" "organisations" {
   count = length(local.sorted-organisations)
-  depends_on = [kubernetes_namespace_v1.ns]
   yaml_body  = <<-EOF
     apiVersion: "vynil.solidite.fr/v1"
     kind: "Install"

meta/domain-devspaces/stations.tf

@@ -18,7 +18,7 @@ locals {
               merge(ds, {
                 "name" = "${org.name}-${ds.name}"
                 "namespace" = "${var.domain}-devspaces-${station.name}"
-                "organisation" = organisation
+                "organisation" = org
                 "usage" = "station"
                 "station" = station
               }) if ds.name == dsname