fix

meta/domain-devspaces/index.yaml

@@ -6,56 +6,72 @@ metadata:
   name: domain-devspaces
   description: null
 options:
+  issuer:
+    default: letsencrypt-prod
+    examples:
+    - letsencrypt-prod
+    type: string
+  storage-classes:
+    default:
+      FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+    examples:
+    - FilesystemReadWriteMany: ''
+      FilesystemReadWriteOnce: ''
+      BlockReadWriteMany: ''
+      BlockReadWriteOnce: ''
+    type: object
+    properties:
+      BlockReadWriteMany:
+        type: string
+        default: ''
+      BlockReadWriteOnce:
+        type: string
+        default: ''
+      FilesystemReadWriteMany:
+        type: string
+        default: ''
+      FilesystemReadWriteOnce:
+        type: string
+        default: ''
   stations-sub-domain:
     default: code
     examples:
     - code
     type: string
-  images:
+  backups:
     default:
-      codeserver:
+      enable: false
-        registry: docker.io
+      endpoint: ''
-        repository: sebt3/code-server
+      secret-name: backup-settings
-        tag: 4.15
+      key-id-key: s3-id
-        pullPolicy: IfNotPresent
+      secret-key: s3-secret
-    properties:
-      codeserver:
-        properties:
-          pullPolicy:
-            enum:
-            - Always
-            - Never
-            - IfNotPresent
-            type: string
-            default: IfNotPresent
-          registry:
-            type: string
-            default: docker.io
-          repository:
-            type: string
-            default: sebt3/code-server
-          tag:
-            type: number
-            default: 4.15
-        type: object
-        default:
-          registry: docker.io
-          repository: sebt3/code-server
-          tag: 4.15
-          pullPolicy: IfNotPresent
     examples:
-    - codeserver:
+    - enable: false
-        registry: docker.io
+      endpoint: ''
-        repository: sebt3/code-server
+      secret-name: backup-settings
-        tag: 4.15
+      key-id-key: s3-id
-        pullPolicy: IfNotPresent
+      secret-key: s3-secret
     type: object
-  domain-name:
+    properties:
-    default: your_company.com
+      enable:
-    examples:
+        type: boolean
-    - your_company.com
+        default: false
+      endpoint:
         type: string
-  external-databases:
+        default: ''
+      key-id-key:
+        type: string
+        default: s3-id
+      secret-key:
+        type: string
+        default: s3-secret
+      secret-name:
+        type: string
+        default: backup-settings
+  organisations:
     default: []
     items:
       type: object
@@ -63,38 +79,34 @@ options:
         name:
           type: string
           default: ''
-        namespace:
+        datasets:
-          type: string
+          default: []
-          default: ''
+          type: array
-        engine:
+          items:
-          type: string
+            type: object
-          default: postgres
+            properties:
-          enum:
+              name:
-          - postgres
+                default: ''
-          - mongo
+                type: string
-          - redis
+              engine:
-          - maria
+                default: pg
-          - rabbit
+                type: string
-        secret:
+    examples:
+    - []
+    type: array
+  stations:
+    default: []
+    items:
       type: object
-          default:
-            name: default
-            namespace: default
-            user-key: username
-            pass-key: password
       properties:
         name:
           type: string
-              default: default
+          default: ''
-            namespace:
+        organisations:
+          default: []
+          type: array
+          items:
             type: string
-              default: default
-            user-key:
-              type: string
-              default: username
-            pass-key:
-              type: string
-              default: password
     examples:
     - []
     type: array
@@ -139,7 +151,46 @@ options:
             default: false
         default:
           enable: false
-  stations:
+  images:
+    default:
+      codeserver:
+        registry: docker.io
+        repository: sebt3/code-server
+        tag: 4.15
+        pullPolicy: IfNotPresent
+    properties:
+      codeserver:
+        properties:
+          pullPolicy:
+            enum:
+            - Always
+            - Never
+            - IfNotPresent
+            type: string
+            default: IfNotPresent
+          registry:
+            type: string
+            default: docker.io
+          repository:
+            type: string
+            default: sebt3/code-server
+          tag:
+            type: number
+            default: 4.15
+        type: object
+        default:
+          registry: docker.io
+          repository: sebt3/code-server
+          tag: 4.15
+          pullPolicy: IfNotPresent
+    examples:
+    - codeserver:
+        registry: docker.io
+        repository: sebt3/code-server
+        tag: 4.15
+        pullPolicy: IfNotPresent
+    type: object
+  external-databases:
     default: []
     items:
       type: object
@@ -147,59 +198,51 @@ options:
         name:
           type: string
           default: ''
-        organisations:
+        namespace:
-          default: []
-          type: array
-          items:
           type: string
+          default: ''
+        engine:
+          type: string
+          default: postgres
+          enum:
+          - postgres
+          - mongo
+          - redis
+          - maria
+          - rabbit
+        secret:
+          type: object
+          default:
+            name: default
+            namespace: default
+            user-key: username
+            pass-key: password
+          properties:
+            name:
+              type: string
+              default: default
+            namespace:
+              type: string
+              default: default
+            user-key:
+              type: string
+              default: username
+            pass-key:
+              type: string
+              default: password
     examples:
     - []
     type: array
-  app-group:
-    default: dev
-    examples:
-    - dev
-    type: string
-  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
-  issuer:
-    default: letsencrypt-prod
-    examples:
-    - letsencrypt-prod
-    type: string
   domain:
     default: your-company
     examples:
     - your-company
     type: string
+  domain-name:
+    default: your_company.com
+    examples:
+    - your_company.com
+    type: string
   distributions:
     default:
       domain: domain
@@ -215,59 +258,16 @@ options:
       domain:
         type: string
         default: domain
-  organisations:
-    default: []
-    items:
-      type: object
-      properties:
-        name:
-          type: string
-          default: ''
-        datasets:
-          default: []
-          type: array
-          items:
-            type: object
-            properties:
-              name:
-                default: ''
-                type: string
-              engine:
-                default: pg
-                type: string
-    examples:
-    - []
-    type: array
   ingress-class:
     default: traefik
     examples:
     - traefik
     type: string
-  storage-classes:
+  app-group:
-    default:
+    default: dev
-      FilesystemReadWriteMany: ''
-      FilesystemReadWriteOnce: ''
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
     examples:
-    - FilesystemReadWriteMany: ''
+    - dev
-      FilesystemReadWriteOnce: ''
-      BlockReadWriteMany: ''
-      BlockReadWriteOnce: ''
-    type: object
-    properties:
-      BlockReadWriteMany:
     type: string
-        default: ''
-      BlockReadWriteOnce:
-        type: string
-        default: ''
-      FilesystemReadWriteMany:
-        type: string
-        default: ''
-      FilesystemReadWriteOnce:
-        type: string
-        default: ''
 dependencies: []
 providers:
   kubernetes: true

meta/domain-devspaces/stations.tf

@@ -50,7 +50,7 @@ resource "kubectl_manifest" "devstations" {
       labels: ${jsonencode(local.common-labels)}
     spec:
       distrib: "${var.distributions.domain}"
-      category: "share"
+      category: "apps"
       component: "code-server"
       options: ${jsonencode(merge(local.global, { for k, v in local.sorted-stations[count.index] : k => v if !contains(["name"], k) }))}
   EOF