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

8
meta/domain-devspaces/apps.tf
View File

@@ -201,7 +201,7 @@ resource "kubernetes_namespace_v1" "apps-ns" {
count = (var.apps.dbgate.enable || var.apps.okd.enable || var.apps.gramo.enable) ? 1 : 0
metadata {
annotations = merge(local.annotations, local.annotations_default)
labels = merge(local.common-labels, local.annotations)
labels = merge(local.common_labels, local.annotations)
name = "${var.namespace}-devapps"
}
}
@@ -215,7 +215,7 @@ resource "kubectl_manifest" "okd" {
metadata:
name: "dev-okd"
namespace: "${kubernetes_namespace_v1.apps-ns[0].metadata[0].name}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
distrib: "${var.distributions.domain}"
category: "apps"
@@ -233,7 +233,7 @@ resource "kubectl_manifest" "gramo" {
metadata:
name: "dev-gramo"
namespace: "${kubernetes_namespace_v1.apps-ns[0].metadata[0].name}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
distrib: "${var.distributions.domain}"
category: "apps"
@@ -251,7 +251,7 @@ resource "kubectl_manifest" "dbgate" {
metadata:
name: "dbgate"
namespace: "${kubernetes_namespace_v1.apps-ns[0].metadata[0].name}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
distrib: "${var.distributions.domain}"
category: "apps"

12
meta/domain-devspaces/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
meta/domain-devspaces/organisations.tf
View File

@@ -18,7 +18,7 @@ resource "kubectl_manifest" "organisations" {
metadata:
name: "org-${local.sorted-organisations[count.index].name}"
namespace: "${var.namespace}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
distrib: "${var.distributions.domain}"
category: "share"

6
meta/domain-devspaces/stations.tf
View File

@@ -34,7 +34,7 @@ resource "kubernetes_namespace_v1" "dev-ns" {
count = length(local.sorted-stations)
metadata {
annotations = local.annotations
labels = merge(local.common-labels, local.annotations)
labels = merge(local.common_labels, local.annotations)
name = "${var.domain}-devspaces-${local.sorted-stations[count.index].name}"
}
}
@@ -48,7 +48,7 @@ resource "kubectl_manifest" "devstations" {
metadata:
name: "${local.sorted-stations[count.index].name}"
namespace: "${var.domain}-devspaces-${local.sorted-stations[count.index].name}"
labels: ${jsonencode(local.common-labels)}
labels: ${jsonencode(local.common_labels)}
spec:
distrib: "${var.distributions.domain}"
category: "apps"
@@ -66,7 +66,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"