From d9aaeef86de3458c5d0f1ebbd8b2d277e36a1009 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Tue, 24 Oct 2023 14:39:00 +0200 Subject: [PATCH] fix --- meta/domain-devspaces/index.yaml | 395 +++++++++++++------------ meta/domain-devspaces/organisations.tf | 3 +- 2 files changed, 202 insertions(+), 196 deletions(-) diff --git a/meta/domain-devspaces/index.yaml b/meta/domain-devspaces/index.yaml index f91a640..0f2c17d 100644 --- a/meta/domain-devspaces/index.yaml +++ b/meta/domain-devspaces/index.yaml @@ -6,6 +6,11 @@ metadata: name: domain-devspaces description: null options: + domain: + default: your-company + examples: + - your-company + type: string external-redis: default: [] examples: @@ -20,16 +25,6 @@ options: type: string type: object type: array - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - stations-sub-domain: - default: code - examples: - - code - type: string apps: default: dbgate: @@ -83,66 +78,6 @@ options: type: boolean type: object type: object - images: - default: - codeserver: - pullPolicy: IfNotPresent - registry: docker.io - repository: sebt3/code-server - tag: 4.15 - examples: - - codeserver: - pullPolicy: IfNotPresent - registry: docker.io - repository: sebt3/code-server - tag: 4.15 - properties: - codeserver: - default: - pullPolicy: IfNotPresent - registry: docker.io - repository: sebt3/code-server - tag: 4.15 - properties: - pullPolicy: - default: IfNotPresent - enum: - - Always - - Never - - IfNotPresent - type: string - registry: - default: docker.io - type: string - repository: - default: sebt3/code-server - type: string - tag: - default: 4.15 - type: number - type: object - type: object - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - stations: - default: [] - examples: - - [] - items: - properties: - name: - default: '' - type: string - organisations: - default: [] - items: - type: string - type: array - type: object - type: array external-marias: default: [] examples: @@ -169,125 +104,6 @@ options: type: string type: object type: array - external-pgs: - default: [] - examples: - - [] - items: - properties: - dbname: - default: '' - type: string - name: - default: '' - type: string - namespace: - default: '' - type: string - secret: - properties: - key: - default: '' - type: string - name: - default: '' - type: string - type: object - username: - default: '' - type: string - type: object - type: array - ingress-class: - default: traefik - examples: - - 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 - organisations: - default: [] - examples: - - [] - items: - properties: - datasets: - default: [] - items: - properties: - databases: - default: [] - items: - properties: - name: - default: db - type: string - type: object - type: array - engine: - default: pg - type: string - name: - default: '' - type: string - type: object - type: array - name: - default: '' - type: string - stages: - default: [] - items: - properties: - name: - default: prod - type: string - type: object - type: array - type: object - type: array - external-mongos: - default: [] - examples: - - [] - items: - properties: - dbname: - default: '' - type: string - name: - default: '' - type: string - namespace: - default: '' - type: string - secret: - properties: - key: - default: '' - type: string - name: - default: '' - type: string - type: object - username: - default: '' - type: string - type: object - type: array storage-classes: default: BlockReadWriteMany: '' @@ -313,10 +129,179 @@ options: default: '' type: string type: object - domain: - default: your-company + external-mongos: + default: [] examples: - - your-company + - [] + items: + properties: + dbname: + default: '' + type: string + name: + default: '' + type: string + namespace: + default: '' + type: string + secret: + properties: + key: + default: '' + type: string + name: + default: '' + type: string + type: object + username: + default: '' + type: string + type: object + type: array + stations: + default: [] + examples: + - [] + items: + properties: + name: + default: '' + type: string + organisations: + default: [] + items: + type: string + type: array + type: object + type: array + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + organisations: + default: [] + examples: + - [] + items: + properties: + datasets: + default: [] + items: + properties: + databases: + default: [] + items: + properties: + name: + default: db + type: string + type: object + type: array + engine: + default: pg + type: string + name: + default: '' + type: string + type: object + type: array + name: + default: '' + type: string + stages: + default: [] + items: + properties: + name: + default: prod + type: string + type: object + type: array + type: object + type: array + app-group: + default: dev + examples: + - dev + type: string + images: + default: + codeserver: + pullPolicy: IfNotPresent + registry: docker.io + repository: sebt3/code-server + tag: 4.18 + examples: + - codeserver: + pullPolicy: IfNotPresent + registry: docker.io + repository: sebt3/code-server + tag: 4.18 + properties: + codeserver: + default: + pullPolicy: IfNotPresent + registry: docker.io + repository: sebt3/code-server + tag: 4.18 + properties: + pullPolicy: + default: IfNotPresent + enum: + - Always + - Never + - IfNotPresent + type: string + registry: + default: docker.io + type: string + repository: + default: sebt3/code-server + type: string + tag: + default: 4.18 + type: number + type: object + type: object + external-pgs: + default: [] + examples: + - [] + items: + properties: + dbname: + default: '' + type: string + name: + default: '' + type: string + namespace: + default: '' + type: string + secret: + properties: + key: + default: '' + type: string + name: + default: '' + type: string + type: object + username: + default: '' + type: string + type: object + type: array + ingress-class: + default: traefik + examples: + - traefik + type: string + stations-sub-domain: + default: code + examples: + - code type: string backups: default: @@ -348,11 +333,31 @@ options: default: backup-settings type: string type: object - app-group: - default: dev + distributions: + default: + core: core + domain: domain examples: - - dev + - 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 diff --git a/meta/domain-devspaces/organisations.tf b/meta/domain-devspaces/organisations.tf index 36e9783..77d5164 100644 --- a/meta/domain-devspaces/organisations.tf +++ b/meta/domain-devspaces/organisations.tf @@ -16,7 +16,7 @@ resource "kubectl_manifest" "organisations" { apiVersion: "vynil.solidite.fr/v1" kind: "Install" metadata: - name: "${local.sorted-organisations[count.index].name}" + name: "org-${local.sorted-organisations[count.index].name}" namespace: "${var.namespace}" labels: ${jsonencode(local.common-labels)} spec: @@ -28,6 +28,7 @@ resource "kubectl_manifest" "organisations" { { "stages" = [] "datasets" = [] + "haveGitea" = var.haveGitea }, { for k, v in local.sorted-organisations[count.index] : k => v if !contains(["name"], k) } ))}