vynil/domain-incoming
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Sébastien Huss
2024-05-12 12:03:32 +02:00
parent 599d175f82
commit 2890064fd4
191 changed files with 893 additions and 1068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
share/organisation/ci-space.tf
View File

@@ -2,7 +2,7 @@ resource "kubernetes_namespace_v1" "ns-tekton" {
count = var.haveGitea && var.haveTekton?1:0
metadata {
annotations = local.annotations
labels = merge(local.common-labels, local.annotations)
labels = merge(local.common_labels, local.annotations)
name = "${var.domain}-ci-${var.instance}"
}
}
@@ -16,7 +16,7 @@ resource "kubectl_manifest" "tekton" {
metadata:
name: "tekton-base"
namespace: "${var.domain}-ci-${var.instance}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
distrib: "${var.distributions.domain}"
category: "share"
@@ -43,7 +43,7 @@ resource "kubectl_manifest" "ci-ssh-creds" {
metadata:
name: "ssh-credentials"
namespace: "${var.domain}-ci-${var.instance}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
length: "2048"
forceRegenerate: false

12
share/organisation/common.tf Normal file
View File

@@ -0,0 +1,12 @@
locals {
common-labels = {
"vynil.solidite.fr/owner-name" = var.instance
"vynil.solidite.fr/owner-namespace" = var.namespace
"vynil.solidite.fr/owner-category" = var.category
"vynil.solidite.fr/owner-component" = var.component
"app.kubernetes.io/managed-by" = "vynil"
"app.kubernetes.io/name" = var.component
"app.kubernetes.io/instance" = var.instance
}
}

2
share/organisation/gitea-user.tf
View File

@@ -58,7 +58,7 @@ resource "kubectl_manifest" "ssh-creds" {
metadata:
name: "ssh-credentials"
namespace: "${local.sorted-stages[count.index].namespace}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
length: "2048"
forceRegenerate: false

8
share/organisation/stages.tf
View File

@@ -38,7 +38,7 @@ resource "kubernetes_namespace_v1" "ns" {
count = length(local.sorted-stages)
metadata {
annotations = local.annotations
labels = merge(local.common-labels, local.annotations)
labels = merge(local.common_labels, local.annotations)
name = local.sorted-stages[count.index].namespace
}
}
@@ -85,7 +85,7 @@ resource "kubectl_manifest" "ci-git-repo" {
metadata:
name: "deploy-git"
namespace: "${local.sorted-stages[count.index].namespace}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
interval: 5m0s
ref:
@@ -104,7 +104,7 @@ resource "kubectl_manifest" "ci-kustomization" {
metadata:
name: "${var.instance}-${var.component}-deploy"
namespace: "${local.sorted-stages[count.index].namespace}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
interval: 5m
path: ./stages/${local.sorted-stages[count.index].name}/deploy
@@ -127,7 +127,7 @@ resource "kubectl_manifest" "datasets" {
metadata:
name: "${local.sorted-datasets[count.index].name}"
namespace: "${local.sorted-datasets[count.index].namespace}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
distrib: "${var.distributions.domain}"
category: "share"