fix
This commit is contained in:
@@ -57,10 +57,16 @@ locals {
|
|||||||
volume = merge(local.global-volume, lookup(lookup(var.woodpecker, "storage", {}), "volume", {}))
|
volume = merge(local.global-volume, lookup(lookup(var.woodpecker, "storage", {}), "volume", {}))
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
sonar = merge(local.global,{ for k, v in var.sonar : k => v if !contains(["enable","storage","backups"],k) },{
|
||||||
|
backups = merge(local.global-backups, lookup(var.sonar, "backups", {}))
|
||||||
|
storage = merge({ for k, v in lookup(var.sonar, "storage", {}) : k => v if !contains(["volume"],k) }, {
|
||||||
|
volume = merge(local.global-volume, lookup(lookup(var.sonar, "storage", {}), "volume", {}))
|
||||||
|
})
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "kubernetes_namespace_v1" "ci-ns" {
|
resource "kubernetes_namespace_v1" "ci-ns" {
|
||||||
count = ( var.gitea.enable )? 1 : 0
|
count = ( var.gitea.enable || var.sonar.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)
|
||||||
@@ -86,6 +92,24 @@ resource "kubectl_manifest" "gitea" {
|
|||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resource "kubectl_manifest" "sonar" {
|
||||||
|
count = var.sonar.enable ? 1 : 0
|
||||||
|
depends_on = [kubernetes_namespace_v1.ci-ns]
|
||||||
|
yaml_body = <<-EOF
|
||||||
|
apiVersion: "vynil.solidite.fr/v1"
|
||||||
|
kind: "Install"
|
||||||
|
metadata:
|
||||||
|
name: "sonar"
|
||||||
|
namespace: "${var.namespace}-ci"
|
||||||
|
labels: ${jsonencode(local.common_labels)}
|
||||||
|
spec:
|
||||||
|
distrib: "${var.distributions.domain}"
|
||||||
|
category: "apps"
|
||||||
|
component: "sonar"
|
||||||
|
options: ${jsonencode(local.sonar)}
|
||||||
|
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]
|
||||||
|
|||||||
@@ -103,6 +103,18 @@ options:
|
|||||||
examples:
|
examples:
|
||||||
- fr_FR
|
- fr_FR
|
||||||
type: string
|
type: string
|
||||||
|
sonar:
|
||||||
|
default:
|
||||||
|
enable: false
|
||||||
|
examples:
|
||||||
|
- enable: false
|
||||||
|
properties:
|
||||||
|
enable:
|
||||||
|
default: false
|
||||||
|
type: boolean
|
||||||
|
type: object
|
||||||
|
x-vynil-category: apps
|
||||||
|
x-vynil-package: sonar
|
||||||
sso_vynil:
|
sso_vynil:
|
||||||
default: true
|
default: true
|
||||||
examples:
|
examples:
|
||||||
|
|||||||
Reference in New Issue
Block a user