From 29318d6a9fdfef8ba48c004869f32f4b419f9c03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Fri, 31 May 2024 10:43:58 +0200 Subject: [PATCH] fix --- meta/domain-ci/apps.tf | 26 +++++++++++++++++++++++++- meta/domain-ci/index.yaml | 12 ++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/meta/domain-ci/apps.tf b/meta/domain-ci/apps.tf index 863a6b0..64d9ee8 100644 --- a/meta/domain-ci/apps.tf +++ b/meta/domain-ci/apps.tf @@ -63,10 +63,16 @@ locals { volume = merge(local.global-volume, lookup(lookup(var.sonar, "storage", {}), "volume", {})) }) }) + taiga = merge(local.global,{ for k, v in var.taiga : k => v if !contains(["enable","storage","backups"],k) },{ + backups = merge(local.global-backups, lookup(var.taiga, "backups", {})) + storage = merge({ for k, v in lookup(var.taiga, "storage", {}) : k => v if !contains(["volume"],k) }, { + volume = merge(local.global-volume, lookup(lookup(var.taiga, "storage", {}), "volume", {})) + }) + }) } resource "kubernetes_namespace_v1" "ci-ns" { - count = ( var.gitea.enable || var.sonar.enable || var.woodpecker.enable )? 1 : 0 + count = ( var.gitea.enable || var.sonar.enable || var.taiga.enable || var.woodpecker.enable )? 1 : 0 metadata { annotations = merge(local.annotations, local.annotations_default) labels = merge(local.common_labels, local.annotations) @@ -110,6 +116,24 @@ resource "kubectl_manifest" "sonar" { EOF } +resource "kubectl_manifest" "taiga" { + count = var.taiga.enable ? 1 : 0 + depends_on = [kubernetes_namespace_v1.ci-ns] + yaml_body = <<-EOF + apiVersion: "vynil.solidite.fr/v1" + kind: "Install" + metadata: + name: "taiga" + namespace: "${var.namespace}-ci" + labels: ${jsonencode(local.common_labels)} + spec: + distrib: "${var.distributions.domain}" + category: "apps" + component: "taiga" + options: ${jsonencode(local.taiga)} + EOF +} + resource "kubectl_manifest" "woodpecker" { count = var.woodpecker.enable ? 1 : 0 depends_on = [kubernetes_namespace_v1.ci-ns] diff --git a/meta/domain-ci/index.yaml b/meta/domain-ci/index.yaml index 15778ce..e97da44 100644 --- a/meta/domain-ci/index.yaml +++ b/meta/domain-ci/index.yaml @@ -143,6 +143,18 @@ options: type: string type: object type: object + taiga: + default: + enable: false + examples: + - enable: false + properties: + enable: + default: false + type: boolean + type: object + x-vynil-category: apps + x-vynil-package: taiga timezone: default: Europe/Paris examples: