fix
This commit is contained in:
@@ -6,7 +6,7 @@ resource "kubectl_manifest" "backup_schedule" {
|
||||
metadata:
|
||||
name: "${var.instance}-backup"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
backend:
|
||||
repoPasswordSecretRef:
|
||||
|
||||
@@ -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
|
||||
@@ -15,7 +15,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"]
|
||||
images {
|
||||
name = "ghcr.io/goauthentik/server"
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
locals {
|
||||
pg-labels = merge(local.common-labels, {
|
||||
pg-labels = merge(local.common_labels, {
|
||||
"app.kubernetes.io/component" = "pg"
|
||||
})
|
||||
pool-labels = merge(local.common-labels, {
|
||||
pool-labels = merge(local.common_labels, {
|
||||
"app.kubernetes.io/component" = "pg-pool"
|
||||
})
|
||||
}
|
||||
|
||||
@@ -14,7 +14,7 @@ resource "kubectl_manifest" "gitlab_userinfo" {
|
||||
metadata:
|
||||
name: "${var.instance}-gitlab-userinfo"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
replacePathRegex:
|
||||
regex: ^/application/o/[^\\/]*/api/v4/user
|
||||
@@ -28,7 +28,7 @@ resource "kubectl_manifest" "gitlab_authorize" {
|
||||
metadata:
|
||||
name: "${var.instance}-gitlab-authorize"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
replacePathRegex:
|
||||
regex: ^/application/o/[^\\/]*/oauth/authorize
|
||||
@@ -42,7 +42,7 @@ resource "kubectl_manifest" "gitlab_token" {
|
||||
metadata:
|
||||
name: "${var.instance}-gitlab-token"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
replacePathRegex:
|
||||
regex: ^/application/o/[^\\/]*/oauth/token
|
||||
@@ -56,7 +56,7 @@ module "ingress" {
|
||||
namespace = var.namespace
|
||||
issuer = var.issuer
|
||||
ingress_class = var.ingress_class
|
||||
labels = local.common-labels
|
||||
labels = local.common_labels
|
||||
dns_names = local.dns_names
|
||||
middlewares = [kubectl_manifest.gitlab_userinfo.name,kubectl_manifest.gitlab_authorize.name,kubectl_manifest.gitlab_token.name]
|
||||
services = [local.service]
|
||||
|
||||
@@ -5,7 +5,7 @@ resource "kubectl_manifest" "authentik_redis" {
|
||||
metadata:
|
||||
name: "${var.name}-${var.component}-redis"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
kubernetesConfig:
|
||||
image: "${var.images.redis.registry}/${var.images.redis.repository}:${var.images.redis.tag}"
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
locals {
|
||||
secrets-labels = merge(local.common-labels, {
|
||||
secrets-labels = merge(local.common_labels, {
|
||||
"app.kubernetes.io/component" = "backup-secret"
|
||||
})
|
||||
secret-labels = merge(local.secrets-labels, {
|
||||
|
||||
Reference in New Issue
Block a user