From 56c9988b21a121598b57871d34f58d138698b26a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 26 Jan 2024 19:14:20 +0100 Subject: [PATCH] fix --- meta/domain-erp/apps.tf | 44 ++++++++---- meta/domain-erp/index.yaml | 138 ++++++++++++++++++------------------- 2 files changed, 97 insertions(+), 85 deletions(-) diff --git a/meta/domain-erp/apps.tf b/meta/domain-erp/apps.tf index ed77445..f46465b 100644 --- a/meta/domain-erp/apps.tf +++ b/meta/domain-erp/apps.tf @@ -18,23 +18,37 @@ locals { "default.vynil.solidite.fr/backups.key_id_key" = var.backups.key_id_key "default.vynil.solidite.fr/backups.secret_key" = var.backups.secret_key "default.vynil.solidite.fr/backups.restic_key" = var.backups.restic_key + "default.vynil.solidite.fr/storage.volume.accessMode" = var.storage.volume.accessMode + "default.vynil.solidite.fr/storage.volume.class" = var.storage.volume.class } global = { - "domain" = var.namespace - "domain_name" = var.domain_name - "issuer" = var.issuer - "ingress_class" = var.ingress_class - "backups" = var.backups + "domain_name" = var.domain_name + "timezone" = var.timezone + "language" = var.language + "domain" = var.domain + "issuer" = var.issuer + "ingress_class" = var.ingress_class + "app_group" = var.app_group } - default-mode = var.storage-classes.FilesystemReadWriteMany!=""?"ReadWriteMany":"ReadWriteOnce" - dolibarr = { for k, v in var.dolibarr : k => v if contains(["enable","storage"],k) } - doli-storage = merge({ - "storage" = { - "size" = lookup(lookup(local.dolibarr, "storage",{}), "size", "10Gi") - "accessMode" = lookup(lookup(local.dolibarr, "storage",{}), "accessMode", local.default-mode) - "type" = "Filesystem" - } - }, { for k, v in var.dolibarr : k => v if k=="storage" }) + global-backups = { + "enable" = var.backups.enable + "use_barman" = var.backups.use_barman + "endpoint" = var.backups.endpoint + "secret_name" = var.backups.secret_name + "key_id_key" = var.backups.key_id_key + "secret_key" = var.backups.secret_key + "restic_key" = var.backups.restic_key + } + global-volume = { + "accessMode" = var.storage.volume.accessMode + "class" = var.storage.volume.class + } + dolibarr = merge(local.global,{ for k, v in var.dolibarr : k => v if !contains(["enable","storage","backups"],k) },{ + backups = merge(lookup(var.dolibarr, "backups", {}), local.global-backups) + storage = merge({ for k, v in lookup(var.dolibarr, "storage", {}) : k => v if !contains(["volume"],k) }, { + volume = merge(lookup(lookup(var.dolibarr, "storage", {}), "volume", {}), local.global-volume) + }) + }) } resource "kubernetes_namespace_v1" "erp-ns" { @@ -60,6 +74,6 @@ resource "kubectl_manifest" "dolibarr" { distrib: "${var.distributions.domain}" category: "apps" component: "dolibarr" - options: ${jsonencode(merge(local.global, local.doli-storage, local.dolibarr))} + options: ${jsonencode(local.dolibarr)} EOF } diff --git a/meta/domain-erp/index.yaml b/meta/domain-erp/index.yaml index bcc69b6..f4c6714 100644 --- a/meta/domain-erp/index.yaml +++ b/meta/domain-erp/index.yaml @@ -6,15 +6,10 @@ metadata: name: domain-erp description: null options: - timezone: - default: Europe/Paris + issuer: + default: letsencrypt-prod examples: - - Europe/Paris - type: string - domain: - default: your-company - examples: - - your-company + - letsencrypt-prod type: string distributions: default: @@ -31,68 +26,6 @@ options: default: domain type: string type: object - app_group: - default: infra - examples: - - infra - type: string - issuer: - default: letsencrypt-prod - examples: - - letsencrypt-prod - type: string - language: - default: fr_FR - examples: - - fr_FR - type: string - domain_name: - default: your-company.com - examples: - - your-company.com - type: string - ingress_class: - default: traefik - examples: - - traefik - type: string - 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 - dolibarr: - default: - enable: true - examples: - - enable: true - properties: - enable: - default: true - type: boolean - type: object - x-vynil-category: apps - x-vynil-package: dolibarr backups: default: enable: false @@ -133,6 +66,71 @@ options: default: false type: boolean type: object + domain: + default: your-company + examples: + - your-company + type: string + dolibarr: + default: + enable: true + examples: + - enable: true + properties: + enable: + default: true + type: boolean + type: object + x-vynil-category: apps + x-vynil-package: dolibarr + domain_name: + default: your-company.com + examples: + - your-company.com + type: string + language: + default: fr_FR + examples: + - fr_FR + type: string + storage: + default: + volume: + accessMode: ReadWriteOnce + class: \"\" + examples: + - volume: + accessMode: ReadWriteOnce + class: \"\" + properties: + volume: + default: + accessMode: ReadWriteOnce + class: \"\" + properties: + accessMode: + default: ReadWriteOnce + type: string + class: + default: \"\" + type: string + type: object + type: object + ingress_class: + default: traefik + examples: + - traefik + type: string + app_group: + default: erp + examples: + - erp + type: string + timezone: + default: Europe/Paris + examples: + - Europe/Paris + type: string dependencies: [] providers: kubernetes: true