fix
This commit is contained in:
@@ -81,7 +81,7 @@ resource "kubernetes_namespace_v1" "infra-ns" {
|
||||
count = ( var.dns.enable || var.okd.enable || var.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}-infra"
|
||||
}
|
||||
}
|
||||
@@ -95,7 +95,7 @@ resource "kubectl_manifest" "dns" {
|
||||
metadata:
|
||||
name: "dns"
|
||||
namespace: "${kubernetes_namespace_v1.infra-ns[0].metadata[0].name}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
distrib: "${var.distributions.domain}"
|
||||
category: "share"
|
||||
@@ -112,7 +112,7 @@ resource "kubectl_manifest" "traefik" {
|
||||
metadata:
|
||||
name: "${var.namespace}"
|
||||
namespace: "${var.traefik.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
distrib: "${var.distributions.domain}"
|
||||
category: "apps"
|
||||
@@ -129,7 +129,7 @@ resource "kubectl_manifest" "k8s_api" {
|
||||
metadata:
|
||||
name: "k8s-api-${var.namespace}"
|
||||
namespace: "default"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
distrib: "${var.distributions.domain}"
|
||||
category: "apps"
|
||||
@@ -147,7 +147,7 @@ resource "kubectl_manifest" "okd" {
|
||||
metadata:
|
||||
name: "infra-okd"
|
||||
namespace: "${kubernetes_namespace_v1.infra-ns[0].metadata[0].name}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
distrib: "${var.distributions.domain}"
|
||||
category: "apps"
|
||||
@@ -165,7 +165,7 @@ resource "kubectl_manifest" "gramo" {
|
||||
metadata:
|
||||
name: "infra-gramo"
|
||||
namespace: "${kubernetes_namespace_v1.infra-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-infra/common.tf
Normal file
12
meta/domain-infra/common.tf
Normal 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
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user