From e16e33f194a3c3e1e78a48e66323af6b5ee4a622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sun, 8 Oct 2023 15:57:08 +0200 Subject: [PATCH] fix --- meta/domain-devspaces/index.yaml | 392 +++++++++++++++--------------- meta/domain-devspaces/stations.tf | 3 +- 2 files changed, 198 insertions(+), 197 deletions(-) diff --git a/meta/domain-devspaces/index.yaml b/meta/domain-devspaces/index.yaml index 88c5e93..4a383b6 100644 --- a/meta/domain-devspaces/index.yaml +++ b/meta/domain-devspaces/index.yaml @@ -6,202 +6,6 @@ metadata: name: domain-devspaces description: null options: - 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 - 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: '' - 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 - domain: - default: your-company - examples: - - your-company - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - ingress-class: - default: traefik - examples: - - traefik - type: string - stations: - default: [] - items: - type: object - properties: - name: - type: string - default: '' - organisations: - default: [] - type: array - items: - type: string - 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 - external-databases: - default: [] - items: - type: object - properties: - name: - type: string - default: '' - namespace: - 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 apps: default: dbgate: @@ -248,6 +52,84 @@ options: examples: - your_company.com type: string + domain: + default: your-company + examples: + - your-company + type: string + external-databases: + default: [] + items: + type: object + properties: + name: + type: string + default: '' + namespace: + 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 + 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 distributions: default: domain: domain @@ -263,11 +145,129 @@ options: domain: type: string default: domain + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + app-group: + default: dev + examples: + - dev + type: string stations-sub-domain: default: code examples: - code 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: '' + 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 + 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 + stations: + default: [] + items: + type: object + properties: + name: + type: string + default: '' + organisations: + default: [] + type: array + items: + type: string + examples: + - [] + type: array + ingress-class: + default: traefik + examples: + - traefik + type: string dependencies: [] providers: kubernetes: true diff --git a/meta/domain-devspaces/stations.tf b/meta/domain-devspaces/stations.tf index d6228e1..4d4ef62 100644 --- a/meta/domain-devspaces/stations.tf +++ b/meta/domain-devspaces/stations.tf @@ -13,7 +13,7 @@ locals { for station in local.sorted-stations: flatten([ for name in distinct(sort(station.organisations)):flatten([ for org in local.sorted-organisations: flatten([ - for dsname in reverse(distinct(sort([for d in org.datasets: d.name]))): + for dsname in reverse(distinct(sort([for d in org.datasets: d.name]))): flatten([ for ds in org.datasets: merge(ds, { "name" = "${org.name}-${ds.name}" @@ -22,6 +22,7 @@ locals { "usage" = "station" "station" = station }) if ds.name = dsname + ]) ]) if org.name == name ]) ])