From 481bccf591af379f484caa36f9063c9dfc3092df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 19 Jan 2024 18:09:33 +0100 Subject: [PATCH] fix --- meta/domain-devspaces/apps.tf | 2 +- meta/domain-devspaces/index.yaml | 416 +++++++++++++++---------------- meta/domain-infra/apps.tf | 2 +- meta/domain-infra/index.yaml | 196 +++++++-------- 4 files changed, 308 insertions(+), 308 deletions(-) diff --git a/meta/domain-devspaces/apps.tf b/meta/domain-devspaces/apps.tf index 87f4a3c..a5226ad 100644 --- a/meta/domain-devspaces/apps.tf +++ b/meta/domain-devspaces/apps.tf @@ -143,7 +143,7 @@ locals { } resource "kubernetes_namespace_v1" "apps-ns" { - count = (var.apps.dbgate.enable || var.apps.okd.enable) ? 1 : 0 + count = (var.apps.dbgate.enable || var.apps.okd.enable || var.apps.gramo.enable) ? 1 : 0 metadata { annotations = local.annotations labels = merge(local.common-labels, local.annotations) diff --git a/meta/domain-devspaces/index.yaml b/meta/domain-devspaces/index.yaml index 714a21f..572bd52 100644 --- a/meta/domain-devspaces/index.yaml +++ b/meta/domain-devspaces/index.yaml @@ -6,114 +6,6 @@ metadata: name: domain-devspaces description: null options: - storage-classes: - default: - BlockReadWriteMany: '' - BlockReadWriteOnce: '' - FilesystemReadWriteMany: '' - FilesystemReadWriteOnce: '' - examples: - - BlockReadWriteMany: '' - BlockReadWriteOnce: '' - FilesystemReadWriteMany: '' - FilesystemReadWriteOnce: '' - properties: - BlockReadWriteMany: - default: '' - type: string - BlockReadWriteOnce: - default: '' - type: string - FilesystemReadWriteMany: - default: '' - type: string - FilesystemReadWriteOnce: - default: '' - type: string - type: object - 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 - app-group: - default: dev - examples: - - dev - type: string - 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 - stations-sub-domain: - default: code - examples: - - code - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string distributions: default: core: core @@ -129,72 +21,6 @@ options: default: domain type: string type: object - domain-name: - default: your_company.com - examples: - - your_company.com - 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: - - [] - items: - properties: - 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 - haveGitea: - default: false - examples: - - false - type: boolean - external-redis: - default: [] - examples: - - [] - items: - properties: - name: - default: '' - type: string - namespace: - default: '' - type: string - type: object - type: array backups: default: enable: false @@ -225,52 +51,75 @@ options: default: backup-settings type: string type: object - ingress-class: - default: traefik - examples: - - traefik - type: string - organisations: + external-redis: 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: + namespace: + default: '' + type: string + type: object + type: array + stations: + default: [] + examples: + - [] + items: + properties: + name: + default: '' + type: string + organisations: default: [] items: - properties: - name: - default: prod - type: string - type: object + type: string type: array 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 + app-group: + default: dev + examples: + - dev + type: string + haveGitea: + default: false + examples: + - false + type: boolean apps: default: dbgate: @@ -342,7 +191,7 @@ options: type: boolean type: object type: object - external-pgs: + external-mongos: default: [] examples: - [] @@ -371,6 +220,157 @@ options: type: string type: object type: array + stations-sub-domain: + default: code + examples: + - code + type: string + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + ingress-class: + default: traefik + examples: + - traefik + 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 + 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 + storage-classes: + default: + BlockReadWriteMany: '' + BlockReadWriteOnce: '' + FilesystemReadWriteMany: '' + FilesystemReadWriteOnce: '' + examples: + - BlockReadWriteMany: '' + BlockReadWriteOnce: '' + FilesystemReadWriteMany: '' + FilesystemReadWriteOnce: '' + properties: + BlockReadWriteMany: + default: '' + type: string + BlockReadWriteOnce: + default: '' + type: string + FilesystemReadWriteMany: + default: '' + type: string + FilesystemReadWriteOnce: + default: '' + type: string + type: object + external-marias: + default: [] + examples: + - [] + items: + properties: + 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 domain: default: your-company examples: diff --git a/meta/domain-infra/apps.tf b/meta/domain-infra/apps.tf index fc89197..72ef934 100644 --- a/meta/domain-infra/apps.tf +++ b/meta/domain-infra/apps.tf @@ -22,7 +22,7 @@ locals { } resource "kubernetes_namespace_v1" "infra-ns" { - count = ( var.dns.enable || var.okd.enable )? 1 : 0 + count = ( var.dns.enable || var.okd.enable || var.gramo.enable )? 1 : 0 metadata { annotations = local.annotations labels = merge(local.common-labels, local.annotations) diff --git a/meta/domain-infra/index.yaml b/meta/domain-infra/index.yaml index e7e3886..7231057 100644 --- a/meta/domain-infra/index.yaml +++ b/meta/domain-infra/index.yaml @@ -6,33 +6,6 @@ metadata: name: domain-infra description: null options: - dns: - default: - enable: false - examples: - - enable: false - properties: - enable: - default: false - type: boolean - type: object - x-vynil-category: share - x-vynil-package: dns - 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 backups: default: enable: false @@ -63,11 +36,109 @@ options: default: backup-settings type: string type: object + api: + default: + enable: false + examples: + - enable: false + properties: + enable: + default: false + type: boolean + type: object + app-group: + default: infra + examples: + - infra + type: string + gramo: + default: + enable: false + examples: + - enable: false + properties: + enable: + default: false + type: boolean + type: object + x-vynil-category: apps + x-vynil-package: gramo domain-name: default: your_company.com examples: - your_company.com type: string + domain: + default: your-company + examples: + - your-company + type: string + okd: + default: + enable: false + examples: + - enable: false + properties: + enable: + default: false + type: boolean + type: object + x-vynil-category: apps + x-vynil-package: okd + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + 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 + ingress-class: + default: traefik + examples: + - traefik + type: string + traefik: + default: + enable: false + namespace: traefik + examples: + - enable: false + namespace: traefik + properties: + enable: + default: false + type: boolean + namespace: + default: traefik + type: string + type: object + x-vynil-category: apps + x-vynil-package: traefix-ui + dns: + default: + enable: false + examples: + - enable: false + properties: + enable: + default: false + type: boolean + type: object + x-vynil-category: share + x-vynil-package: dns storage-classes: default: BlockReadWriteMany: '' @@ -93,77 +164,6 @@ options: default: '' type: string type: object - app-group: - default: infra - examples: - - infra - type: string - okd: - default: - enable: false - examples: - - enable: false - properties: - enable: - default: false - type: boolean - type: object - x-vynil-category: apps - x-vynil-package: okd - api: - default: - enable: false - examples: - - enable: false - properties: - enable: - default: false - type: boolean - type: object - distributions: - default: - core: core - domain: domain - examples: - - core: core - domain: domain - properties: - core: - default: core - type: string - domain: - default: domain - type: string - type: object - traefik: - default: - enable: false - namespace: traefik - examples: - - enable: false - namespace: traefik - properties: - enable: - default: false - type: boolean - namespace: - default: traefik - type: string - type: object - x-vynil-category: apps - x-vynil-package: traefix-ui - gramo: - default: - enable: false - examples: - - enable: false - properties: - enable: - default: false - type: boolean - type: object - x-vynil-category: apps - x-vynil-package: gramo dependencies: [] providers: kubernetes: true