From b094e78620bc9b98683467376efc428310b756e0 Mon Sep 17 00:00:00 2001
From: pierre <pierre@geeraert.eu>
Date: Tue, 6 May 2025 13:40:57 +0100
Subject: [PATCH] enable PVC as well and redis/db

---
 module.tf             | 18 ++++++++----------
 variables.auto.tfvars |  3 ++-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/module.tf b/module.tf
index cf5be14..cbb4454 100644
--- a/module.tf
+++ b/module.tf
@@ -69,7 +69,7 @@ locals {
         pvc_size           = pvc.pvc_size
         mount_path         = pvc.mount_path
         storage_class_name = pvc.storage_class_name
-        namespace          = coalesce(value.namespace, key)
+        namespace          = coalesce(value.namespace,value.connected_namespace, key)
     }] if value.enabled == true && value.pvc != null
   ])
 }
@@ -88,7 +88,6 @@ locals {
 data "kubernetes_all_namespaces" "allns" {}
 
 resource "kubernetes_namespace" "automatic" {
-  # for_each = { for key, value in var.kubernetes : key => value if value.enabled == true && !(value.block_namespace_creation) }
   for_each = { for key, value in var.kubernetes : key => value if value.enabled == true && value.connected_namespace == "" }
   metadata {
     annotations = {
@@ -127,10 +126,9 @@ resource "kubernetes_manifest" "service" {
 
 
 resource "kubernetes_persistent_volume_claim" "automatic-pvc" {
-  #  for_each = { for key, value in var.kubernetes : key => value if value.enabled == true }
   for_each = { for key, value in local.pvc_details : "${value.index}" => merge(value, { mew_key = value.index }) if value.pvc }
   metadata {
-    namespace = each.value.namespace
+    namespace = coalesce(each.value.namespace, each.key)
     name      = "${each.value.name}-pvc"
     labels = {
       deployment_method = "Terraform"
@@ -149,7 +147,7 @@ resource "kubernetes_persistent_volume_claim" "automatic-pvc" {
 resource "kubernetes_persistent_volume_claim" "automatic-pvc-database" {
   for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
   metadata {
-    namespace = each.value.namespace
+    namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
     name      = "${each.key}-db-pvc"
     labels = {
       deployment_method = "Terraform"
@@ -169,7 +167,7 @@ resource "kubernetes_persistent_volume_claim" "automatic-pvc-database" {
 resource "kubernetes_persistent_volume_claim" "automatic-pvc-redis" {
   for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
   metadata {
-    namespace = each.value.namespace
+    namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
     name      = "${each.key}-redis-pvc"
     labels = {
       deployment_method = "Terraform"
@@ -221,7 +219,7 @@ resource "kubernetes_service" "automatic_service_database" {
   for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
   metadata {
     name      = "${each.key}-db-svc"
-    namespace = coalesce(each.value.namespace, each.key)
+    namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
     labels = {
       deployment_method = "Terraform"
     }
@@ -246,7 +244,7 @@ resource "kubernetes_service" "automatic_service_redis" {
   for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
   metadata {
     name      = "${each.key}-redis-svc"
-    namespace = coalesce(each.value.namespace, each.key)
+    namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
     labels = {
       deployment_method = "Terraform"
     }
@@ -454,7 +452,7 @@ resource "kubernetes_deployment_v1" "database-automatic" {
 
 
   metadata {
-    namespace = coalesce(each.value.namespace, each.key)
+    namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
     name      = "${coalesce(each.value.namespace, each.key)}-db"
     labels = {
       app               = each.key
@@ -579,7 +577,7 @@ resource "kubernetes_deployment_v1" "redis-automatic" {
 
 
   metadata {
-    namespace = coalesce(each.value.namespace, each.key)
+    namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
     name      = "${coalesce(each.value.namespace, each.key)}-redis"
     labels = {
       app               = each.key
diff --git a/variables.auto.tfvars b/variables.auto.tfvars
index 10d22f5..f3c9968 100644
--- a/variables.auto.tfvars
+++ b/variables.auto.tfvars
@@ -735,7 +735,8 @@ kubernetes = {
 
   }
   pinchflat = {
-    enabled      = false
+#    enabled      = false
+ connected_namespace = "screeps"
     image        = "ghcr.io/kieraneglin/pinchflat:latest"
     service_port = 8945