fix

share/organisation/index.yaml

@@ -6,16 +6,36 @@ metadata:
   name: organisation
   description: null
 options:
-  ingress-class:
-    default: traefik
+  distributions:
+    default:
+      core: core
+      domain: domain
     examples:
-    - traefik
-    type: string
+    - 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
+  haveGitea:
+    default: false
+    examples:
+    - false
+    type: boolean
+  domain:
+    default: your-company
+    examples:
+    - your-company
+    type: string
   datasets:
     default: []
     items:
@@ -28,6 +48,11 @@ options:
           type: string
       type: object
     type: array
+  app-group:
+    default: dev
+    examples:
+    - dev
+    type: string
   backups:
     default:
       enable: false
@@ -58,11 +83,6 @@ options:
         default: backup-settings
         type: string
     type: object
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
   stages:
     default: []
     items:
@@ -72,36 +92,16 @@ options:
           type: string
       type: object
     type: array
-  domain:
-    default: your-company
+  ingress-class:
+    default: traefik
     examples:
-    - your-company
+    - traefik
     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
   domain-name:
     default: your_company.com
     examples:
     - your_company.com
     type: string
-  haveGitea:
-    default: false
-    examples:
-    - false
-    type: boolean
 dependencies: []
 providers:
   kubernetes: true
@@ -110,4 +110,5 @@ providers:
   postgresql: null
   restapi: null
   http: null
+  gitea: null
 tfaddtype: null

share/organisation/stages.tf

@@ -25,7 +25,10 @@ locals {
     for stage in local.sorted-stage-name: flatten([
       for name in local.sorted-dataset-name: [
         for ds in var.datasets:
-          merge(ds,{"namespace" = "${var.domain}-${var.instance}-${stage}"}) if ds.name == name
+          merge(ds,{
+            "sub-domain" = "${stage}.${var.instance}"
+            "namespace" = "${var.domain}-${var.instance}-${stage}"
+          }) if ds.name == name
       ]
     ])
   ])