fix
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
locals {
|
||||
create-labels = merge(local.common-labels, {
|
||||
create-labels = merge(local.common_labels, {
|
||||
"type" = "repo-new"
|
||||
})
|
||||
activate-labels = merge(local.common-labels, {
|
||||
activate-labels = merge(local.common_labels, {
|
||||
"type" = "package-new"
|
||||
})
|
||||
delete-labels = merge(local.common-labels, {
|
||||
delete-labels = merge(local.common_labels, {
|
||||
"type" = "repo-delete"
|
||||
})
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
locals {
|
||||
push-labels = merge(local.common-labels, {
|
||||
push-labels = merge(local.common_labels, {
|
||||
"type" = "branch-push"
|
||||
})
|
||||
tag-labels = merge(local.common-labels, {
|
||||
tag-labels = merge(local.common_labels, {
|
||||
"type" = "tag-push"
|
||||
})
|
||||
}
|
||||
@@ -118,7 +118,7 @@ resource "kubectl_manifest" "ci-git-repo" {
|
||||
metadata:
|
||||
name: "${var.instance}-${var.component}-ci"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
interval: 5m0s
|
||||
ref:
|
||||
@@ -137,7 +137,7 @@ resource "kubectl_manifest" "ci-kustomization" {
|
||||
metadata:
|
||||
name: "${var.instance}-${var.component}-ci"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
interval: 5m
|
||||
path: ./ci
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
locals {
|
||||
common-labels = {
|
||||
common_labels = {
|
||||
"vynil.solidite.fr/owner-name" = var.instance
|
||||
"vynil.solidite.fr/owner-namespace" = var.namespace
|
||||
"vynil.solidite.fr/owner-category" = var.category
|
||||
@@ -12,7 +12,7 @@ locals {
|
||||
|
||||
data "kustomization_overlay" "data" {
|
||||
namespace = var.namespace
|
||||
common_labels = local.common-labels
|
||||
common_labels = local.common_labels
|
||||
resources = [for file in fileset(path.module, "*.yaml"): file if file != "index.yaml"]
|
||||
patches {
|
||||
target {
|
||||
|
||||
@@ -5,7 +5,7 @@ resource "kubectl_manifest" "el" {
|
||||
metadata:
|
||||
name: "${var.instance}-${var.component}"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
serviceAccountName: "${var.instance}-${var.component}"
|
||||
triggerGroups:
|
||||
|
||||
@@ -20,7 +20,7 @@ resource "kubectl_manifest" "pvc" {
|
||||
namespace: "${var.namespace}"
|
||||
annotations:
|
||||
k8up.io/backup: "false"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec: ${jsonencode(local.pvc_spec)}
|
||||
EOF
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ resource "kubectl_manifest" "sa" {
|
||||
metadata:
|
||||
name: "${var.instance}-${var.component}"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
EOF
|
||||
}
|
||||
resource "kubectl_manifest" "rb" {
|
||||
@@ -16,7 +16,7 @@ resource "kubectl_manifest" "rb" {
|
||||
metadata:
|
||||
name: "${var.instance}-${var.component}"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: "${var.instance}-${var.component}"
|
||||
@@ -33,7 +33,7 @@ resource "kubectl_manifest" "crb" {
|
||||
metadata:
|
||||
name: "${var.namespace}-${var.instance}-${var.component}"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
subjects:
|
||||
- kind: ServiceAccount
|
||||
name: "${var.instance}-${var.component}"
|
||||
|
||||
Reference in New Issue
Block a user