From 6e193f53885100b59329c526a4592d0c6c985bd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Huss?= Date: Mon, 27 May 2024 08:02:28 +0200 Subject: [PATCH] fix --- apps/taiga/taiga_ConfigMap.tf | 31 +++++++++++++++++++++++++++++-- apps/taiga/taiga_Job.tf | 2 +- apps/taiga/taiga_workload.tf | 6 +++--- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/apps/taiga/taiga_ConfigMap.tf b/apps/taiga/taiga_ConfigMap.tf index 25f8ea4..6fee264 100644 --- a/apps/taiga/taiga_ConfigMap.tf +++ b/apps/taiga/taiga_ConfigMap.tf @@ -1,9 +1,9 @@ -resource "kubectl_manifest" "cm_env" { +resource "kubectl_manifest" "cm_env_back" { yaml_body = <<-EOF apiVersion: v1 kind: ConfigMap metadata: - name: "${var.instance}-${var.component}-envs" + name: "${var.instance}-${var.component}-back" labels: ${jsonencode(local.common_labels)} namespace: ${var.namespace} data: @@ -28,6 +28,33 @@ resource "kubectl_manifest" "cm_env" { EOF } +resource "kubectl_manifest" "cm_env_front" { + yaml_body = <<-EOF + apiVersion: v1 + kind: ConfigMap + metadata: + name: "${var.instance}-${var.component}-from" + labels: ${jsonencode(local.common_labels)} + namespace: ${var.namespace} + data: + TAIGA_URL: https://localhost:9000 + TAIGA_SITES_DOMAIN: localhost:9000 + TAIGA_SITES_SCHEME: https + SESSION_COOKIE_SECURE: "false" + CSRF_COOKIE_SECURE: "false" + ENABLE_TELEMETRY: "false" + PUBLIC_REGISTER_ENABLED: "false" + ENABLE_GITHUB_AUTH: "false" + ENABLE_GITLAB_AUTH: "true" + ENABLE_SLACK: "false" + ENABLE_GITHUB_IMPORTER: "false" + ENABLE_JIRA_IMPORTER: "false" + ENABLE_TRELLO_IMPORTER: "false" + OPENID_CONNECT_SCOPES: "openid email profile" + +EOF +} + resource "kubectl_manifest" "cm_scripts" { yaml_body = <<-EOF apiVersion: v1 diff --git a/apps/taiga/taiga_Job.tf b/apps/taiga/taiga_Job.tf index b2baa99..f9677dd 100644 --- a/apps/taiga/taiga_Job.tf +++ b/apps/taiga/taiga_Job.tf @@ -25,7 +25,7 @@ resource "kubectl_manifest" "Job_taiga-createinitialtemplates" { - secretRef: name: ${kubectl_manifest.secret.name} - configMapRef: - name: ${kubectl_manifest.cm_env.name} + name: ${kubectl_manifest.cm_env_back.name} volumeMounts: - name: scripts mountPath: /scripts diff --git a/apps/taiga/taiga_workload.tf b/apps/taiga/taiga_workload.tf index a3e84c3..8ce5db7 100644 --- a/apps/taiga/taiga_workload.tf +++ b/apps/taiga/taiga_workload.tf @@ -83,7 +83,7 @@ resource "kubectl_manifest" "Deployment_taiga-front" { value: gitlab-api-client-id envFrom: - configMapRef: - name: ${kubectl_manifest.cm_env.name} + name: ${kubectl_manifest.cm_env_front.name} ports: - name: taiga-front containerPort: 80 @@ -172,7 +172,7 @@ resource "kubectl_manifest" "Deployment_taiga-back" { - secretRef: name: ${kubectl_manifest.secret.name} - configMapRef: - name: ${kubectl_manifest.cm_env.name} + name: ${kubectl_manifest.cm_env_back.name} ports: - name: taiga-back containerPort: 8000 @@ -226,7 +226,7 @@ resource "kubectl_manifest" "Deployment_taiga-back" { - secretRef: name: ${kubectl_manifest.secret.name} - configMapRef: - name: ${kubectl_manifest.cm_env.name} + name: ${kubectl_manifest.cm_env_back.name} volumeMounts: - name: data mountPath: /taiga-back/static