fix
This commit is contained in:
@@ -63,10 +63,16 @@ locals {
|
|||||||
volume = merge(local.global-volume, lookup(lookup(var.sonar, "storage", {}), "volume", {}))
|
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" {
|
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 {
|
metadata {
|
||||||
annotations = merge(local.annotations, local.annotations_default)
|
annotations = merge(local.annotations, local.annotations_default)
|
||||||
labels = merge(local.common_labels, local.annotations)
|
labels = merge(local.common_labels, local.annotations)
|
||||||
@@ -110,6 +116,24 @@ resource "kubectl_manifest" "sonar" {
|
|||||||
EOF
|
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" {
|
resource "kubectl_manifest" "woodpecker" {
|
||||||
count = var.woodpecker.enable ? 1 : 0
|
count = var.woodpecker.enable ? 1 : 0
|
||||||
depends_on = [kubernetes_namespace_v1.ci-ns]
|
depends_on = [kubernetes_namespace_v1.ci-ns]
|
||||||
|
|||||||
@@ -143,6 +143,18 @@ options:
|
|||||||
type: string
|
type: string
|
||||||
type: object
|
type: object
|
||||||
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:
|
timezone:
|
||||||
default: Europe/Paris
|
default: Europe/Paris
|
||||||
examples:
|
examples:
|
||||||
|
|||||||
Reference in New Issue
Block a user