From 8fd74c55cdb2a74cdbd1a1f7ff84258c30273653 Mon Sep 17 00:00:00 2001 From: pierre Date: Thu, 12 Dec 2024 15:31:53 +0000 Subject: [PATCH] enable customer port for database --- module.tf | 14 ++++---- variables.auto.tfvars | 77 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 81 insertions(+), 10 deletions(-) diff --git a/module.tf b/module.tf index 11377fa..9bff55c 100644 --- a/module.tf +++ b/module.tf @@ -130,12 +130,12 @@ resource "kubernetes_namespace" "automatic" { #} -resource "kubernetes_manifest" "service" { - provider = kubernetes-alpha +#resource "kubernetes_manifest" "service" { +# provider = kubernetes-alpha - manifest = yamldecode(file("/opt/kubernetes/Terraform_kube/onitama_secret2.yaml")) - # manifest = yamldecode(interpolate(file("/opt/kubernetes/Terraform_kube/onitama_secret.yaml"))) -} +# manifest = yamldecode(file("/opt/kubernetes/Terraform_kube/onitama_secret2.yaml")) +# manifest = yamldecode(interpolate(file("/opt/kubernetes/Terraform_kube/onitama_secret.yaml"))) +#} resource "kubernetes_persistent_volume_claim" "automatic-pvc" { @@ -235,8 +235,8 @@ resource "kubernetes_service" "automatic_service_database" { app = "${each.key}-db" } port { - port = 5432 - target_port = 5432 + port = try(each.value.database.port, 5432) + target_port = try(each.value.database.port, 5432) } diff --git a/variables.auto.tfvars b/variables.auto.tfvars index 8f9353c..d26eaee 100644 --- a/variables.auto.tfvars +++ b/variables.auto.tfvars @@ -1,4 +1,74 @@ kubernetes = { + bookstack = { + namespace = "bookstack-terraform" + enabled = true + image = "lscr.io/linuxserver/bookstack" + service_port = 80 + database = { + "image" = "lscr.io/linuxserver/mariadb" + "port" = 3306 + } + requirements = { + limits-cpu = "500m" + limits-memory = "400Mi" + requests-cpu = "300m" + requests-memory = "300Mi" + } + secret_ref = ["bookstack-credentials"] + config_map_ref = ["config"] + + environment = { + POSTGRES_HOST = { + value = "db" + } + } + + environment = { + MYSQL_ROOT_PASSWORD = { + value_from = { + secret_key_ref = { + name = "bookstack-credentials" + key = "DB_PASS" + } + } + } + MYSQL_DATABASE = { + value_from = { + secret_key_ref = { + name = "bookstack-credentials" + key = "DB_DATABASE" + } + } + } + MYSQL_USER = { + value_from = { + secret_key_ref = { + name = "bookstack-credentials" + key = "DB_USER" + } + } + } + MYSQL_PASSWORD = { + value_from = { + secret_key_ref = { + name = "bookstack-credentials" + key = "DB_PASS" + } + } + } + } + + pvc = { + bookstack-webserver = { + name = "bookstack-webserver" + pvc = true + pvc_size = "2Gi" + mount_path = "/config" + } + } + } + + screeps = { enabled = false name = "screeps-server" @@ -41,7 +111,8 @@ kubernetes = { } } - secret_ref = ["secret1", "secret2"] + # secret_ref = ["secret1", "secret2"] + secret_ref = ["secret1"] environment = { PORT = { value = "80" @@ -277,8 +348,8 @@ kubernetes = { requests-cpu = "800Mi" requests-memory = "800Mi" } - secret_ref = ["secret1", "secret2"] - config_map_ref = ["config"] + secret_ref = ["secret1", "secret2"] + config_map_ref = ["config"] environment = { POSTGRES_DB = {