From 0327357c8e36d080117f202b63f83b420144c5d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Mon, 2 Oct 2023 08:55:52 +0200 Subject: [PATCH] fix --- meta/domain/index.yaml | 224 ++++++++++++++++++++-------------------- meta/domain/installs.tf | 2 +- 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/meta/domain/index.yaml b/meta/domain/index.yaml index 0f4f9a5..9add49e 100644 --- a/meta/domain/index.yaml +++ b/meta/domain/index.yaml @@ -6,11 +6,31 @@ metadata: name: domain description: null options: + distributions: + default: + core: core + domain: domain + examples: + - core: core + domain: domain + properties: + core: + default: core + type: string + domain: + default: domain + type: string + type: object issuer: default: letsencrypt-prod examples: - letsencrypt-prod type: string + domain-name: + default: your_company.com + examples: + - your_company.com + type: string auth: default: enable: true @@ -21,11 +41,28 @@ options: default: true type: boolean type: object - domain-name: - default: your_company.com + ci: + default: + enable: false + gitea: + enable: true examples: - - your_company.com - type: string + - enable: false + gitea: + enable: true + properties: + enable: + default: false + type: boolean + gitea: + default: + enable: true + properties: + enable: + default: true + type: boolean + type: object + type: object devspaces: default: enable: false @@ -36,61 +73,6 @@ options: default: false type: boolean type: object - backups: - default: - enable: false - endpoint: '' - key-id-key: s3-id - secret-key: s3-secret - secret-name: backup-settings - examples: - - enable: false - endpoint: '' - key-id-key: s3-id - secret-key: s3-secret - secret-name: backup-settings - properties: - enable: - default: false - type: boolean - endpoint: - default: '' - type: string - key-id-key: - default: s3-id - type: string - secret-key: - default: s3-secret - type: string - secret-name: - default: backup-settings - type: string - 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 infra: default: enable: false @@ -113,48 +95,6 @@ options: type: boolean type: object type: object - 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 - erp: - default: - dolibarr: - enable: true - enable: false - examples: - - dolibarr: - enable: true - enable: false - properties: - dolibarr: - default: - enable: true - properties: - enable: - default: true - type: boolean - type: object - enable: - default: false - type: boolean - type: object apps: default: enable: false @@ -187,20 +127,42 @@ options: default: false type: boolean type: object - ci: + storage-classes: default: - enable: false - gitea: - enable: true + BlockReadWriteMany: '' + BlockReadWriteOnce: '' + FilesystemReadWriteMany: '' + FilesystemReadWriteOnce: '' examples: - - enable: false - gitea: - enable: true + - BlockReadWriteMany: '' + BlockReadWriteOnce: '' + FilesystemReadWriteMany: '' + FilesystemReadWriteOnce: '' properties: - enable: - default: false - type: boolean - gitea: + BlockReadWriteMany: + default: '' + type: string + BlockReadWriteOnce: + default: '' + type: string + FilesystemReadWriteMany: + default: '' + type: string + FilesystemReadWriteOnce: + default: '' + type: string + type: object + erp: + default: + dolibarr: + enable: true + enable: false + examples: + - dolibarr: + enable: true + enable: false + properties: + dolibarr: default: enable: true properties: @@ -208,6 +170,44 @@ options: default: true type: boolean type: object + enable: + default: false + type: boolean + type: object + ingress-class: + default: traefik + examples: + - traefik + type: string + backups: + default: + enable: false + endpoint: '' + key-id-key: s3-id + secret-key: s3-secret + secret-name: backup-settings + examples: + - enable: false + endpoint: '' + key-id-key: s3-id + secret-key: s3-secret + secret-name: backup-settings + properties: + enable: + default: false + type: boolean + endpoint: + default: '' + type: string + key-id-key: + default: s3-id + type: string + secret-key: + default: s3-secret + type: string + secret-name: + default: backup-settings + type: string type: object dependencies: [] providers: diff --git a/meta/domain/installs.tf b/meta/domain/installs.tf index 2b08f59..3176735 100644 --- a/meta/domain/installs.tf +++ b/meta/domain/installs.tf @@ -67,7 +67,7 @@ resource "kubectl_manifest" "auth" { distrib: "${var.distributions.domain}" category: "meta" component: "domain-auth" - options: ${jsonencode(merge(local.global, local.added-auth, local.auth))} + options: ${jsonencode(merge(local.global, local.added-auth, local.auth, local.divisions))} EOF } resource "kubectl_manifest" "infra" {