From 42079b09a4d6ef697cf5f6db8798be459ec07a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Sun, 8 Oct 2023 17:49:25 +0200 Subject: [PATCH] fix --- meta/domain-devspaces/index.yaml | 284 +++++++++++++++--------------- meta/domain-devspaces/stations.tf | 2 +- 2 files changed, 143 insertions(+), 143 deletions(-) diff --git a/meta/domain-devspaces/index.yaml b/meta/domain-devspaces/index.yaml index 3ba119d..a110fbd 100644 --- a/meta/domain-devspaces/index.yaml +++ b/meta/domain-devspaces/index.yaml @@ -6,26 +6,11 @@ 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: @@ -65,108 +50,11 @@ 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 + domain-name: + default: your_company.com 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 + - your_company.com + type: string external-databases: default: [] items: @@ -210,16 +98,151 @@ options: examples: - [] type: array - domain-name: - default: your_company.com + apps: + default: + dbgate: + enable: false + superset: + enable: false + yaade: + enable: false examples: - - your_company.com + - 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: + 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 + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod type: string domain: default: your-company examples: - your-company type: string + distributions: + default: + domain: domain + core: core + examples: + - domain: domain + core: core + type: object + properties: + core: + type: string + default: core + 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: default: FilesystemReadWriteMany: '' @@ -245,29 +268,6 @@ options: 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 dependencies: [] providers: kubernetes: true diff --git a/meta/domain-devspaces/stations.tf b/meta/domain-devspaces/stations.tf index bf1bfde..037f0a6 100644 --- a/meta/domain-devspaces/stations.tf +++ b/meta/domain-devspaces/stations.tf @@ -64,7 +64,7 @@ resource "kubectl_manifest" "datasets" { kind: "Install" metadata: name: "${local.sorted-datasets[count.index].name}" - namespace: "${local.sorted-datasets[count.index].name}" + namespace: "${local.sorted-datasets[count.index].namespace}" labels: ${jsonencode(local.common-labels)} spec: distrib: "${var.distributions.domain}"