From 5d4193ac3ad03d3e607e515a43d0b6bf95b3b125 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Mon, 2 Oct 2023 08:54:57 +0200 Subject: [PATCH] fix --- meta/domain/index.yaml | 224 ++++++++++++++++++++-------------------- meta/domain/installs.tf | 19 +++- 2 files changed, 130 insertions(+), 113 deletions(-) diff --git a/meta/domain/index.yaml b/meta/domain/index.yaml index e72a39e..0f4f9a5 100644 --- a/meta/domain/index.yaml +++ b/meta/domain/index.yaml @@ -6,6 +6,118 @@ metadata: name: domain description: null options: + issuer: + default: letsencrypt-prod + examples: + - letsencrypt-prod + type: string + auth: + default: + enable: true + examples: + - enable: true + properties: + enable: + default: true + type: boolean + type: object + domain-name: + default: your_company.com + examples: + - your_company.com + type: string + devspaces: + default: + enable: false + examples: + - enable: false + properties: + enable: + 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 + traefik: + enable: false + examples: + - enable: false + traefik: + enable: false + properties: + enable: + default: false + type: boolean + traefik: + default: + enable: false + properties: + enable: + default: false + type: boolean + type: object + type: object + ingress-class: + default: traefik + examples: + - traefik + type: string distributions: default: core: core @@ -43,103 +155,6 @@ options: default: false type: boolean 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 - auth: - default: - enable: true - examples: - - enable: true - properties: - enable: - default: true - 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 - domain-name: - default: your_company.com - examples: - - your_company.com - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - infra: - default: - enable: false - traefik: - enable: false - examples: - - enable: false - traefik: - enable: false - properties: - enable: - default: false - type: boolean - traefik: - default: - enable: false - properties: - enable: - default: false - type: boolean - type: object - type: object apps: default: enable: false @@ -172,11 +187,6 @@ options: default: false type: boolean type: object - ingress-class: - default: traefik - examples: - - traefik - type: string ci: default: enable: false @@ -199,16 +209,6 @@ options: type: boolean type: object type: object - devspaces: - default: - enable: false - examples: - - enable: false - properties: - enable: - default: false - type: boolean - type: object dependencies: [] providers: kubernetes: null diff --git a/meta/domain/installs.tf b/meta/domain/installs.tf index dcb2162..2b08f59 100644 --- a/meta/domain/installs.tf +++ b/meta/domain/installs.tf @@ -20,7 +20,7 @@ locals { ci = { for k, v in var.ci : k => v if k!="enable" } erp = { for k, v in var.erp : k => v if k!="enable" } apps = { for k, v in var.apps : k => v if k!="enable" } - mail = { for k, v in var.apps : k => v if k!="enable" } + mail = { for k, v in var.mail : k => v if k!="enable" } # Force install authentik and it's modules when any are needed use-ldap = (var.ci.enable && var.ci.gitea.enable) || (var.erp.enable && var.erp.dolibarr.enable) @@ -35,6 +35,23 @@ locals { added-auth = local.use-ldap||local.use-forward||local.use-other-auth?merge({ "authentik" = {"enable" = true} },local.added-auth-ldap,local.added-auth-forward):{} + divisions = { + "clients" = { + "enable" = false + "apps" = [] + "divisions" = [] + } + "employes" = { + "enable" = true + "apps" = [] + "divisions" = [] + } + "fournisseurs" = { + "enable" = false + "apps" = [] + "divisions" = [] + } + } } resource "kubectl_manifest" "auth" {