fix
This commit is contained in:
@@ -66,7 +66,7 @@ resource "kubectl_manifest" "dbgate-config" {
|
||||
metadata:
|
||||
name: "${var.component}-${var.instance}"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
data: ${jsonencode(merge(local.oauth_config, local.connection_vars))}
|
||||
EOF
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
locals {
|
||||
authentik_url = "http://authentik.${var.domain}-auth.svc"
|
||||
authentik_token = data.kubernetes_secret_v1.authentik.data["AUTHENTIK_BOOTSTRAP_TOKEN"]
|
||||
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
|
||||
@@ -28,6 +28,6 @@ data "kubernetes_ingress_v1" "authentik" {
|
||||
|
||||
data "kustomization_overlay" "data" {
|
||||
namespace = var.namespace
|
||||
common_labels = local.common-labels
|
||||
common_labels = local.common_labels
|
||||
resources = []
|
||||
}
|
||||
|
||||
@@ -28,17 +28,17 @@ resource "kubectl_manifest" "deploy" {
|
||||
metadata:
|
||||
name: "${var.component}-${var.instance}"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
annotations:
|
||||
configmap.reloader.stakater.com/reload: "${var.component}-${var.instance}"
|
||||
secret.reloader.stakater.com/reload: "${var.component}-${var.instance}"
|
||||
spec:
|
||||
replicas: 1
|
||||
selector:
|
||||
matchLabels: ${jsonencode(local.common-labels)}
|
||||
matchLabels: ${jsonencode(local.common_labels)}
|
||||
template:
|
||||
metadata:
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec:
|
||||
securityContext:
|
||||
fsGroup: 1000
|
||||
|
||||
@@ -14,7 +14,7 @@ module "service" {
|
||||
component = var.component
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
labels = local.common-labels
|
||||
labels = local.common_labels
|
||||
targets = ["http"]
|
||||
providers = {
|
||||
kubectl = kubectl
|
||||
@@ -28,7 +28,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 = []
|
||||
services = [module.service.default_definition]
|
||||
@@ -56,7 +56,7 @@ module "oauth2" {
|
||||
instance = var.instance
|
||||
namespace = var.namespace
|
||||
domain = var.domain
|
||||
labels = local.common-labels
|
||||
labels = local.common_labels
|
||||
dns_name = local.dns_name
|
||||
redirect_path = ""
|
||||
providers = {
|
||||
|
||||
@@ -18,7 +18,7 @@ resource "kubectl_manifest" "pvc" {
|
||||
metadata:
|
||||
name: "${var.component}-${var.instance}"
|
||||
namespace: "${var.namespace}"
|
||||
labels: ${jsonencode(local.common-labels)}
|
||||
labels: ${jsonencode(local.common_labels)}
|
||||
spec: ${jsonencode(local.pvc_spec)}
|
||||
EOF
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user