old database with old path

applications/database.tf

@@ -0,0 +1,4 @@
+module "Database-automatic" {
+  source           = "../modules/database"
+  kubernetes_input = var.kubernetes
+}

applications/deployment.tf

@@ -0,0 +1,15 @@
+module "ingress" {
+  source           = "../modules/ingress"
+  kubernetes_input = var.kubernetes
+}
+
+module "services" {
+  source           = "../modules/services"
+  kubernetes_input = var.kubernetes
+}
+
+
+module "Deployment-automatic" {
+  source           = "../modules/deployment"
+  kubernetes_input = var.kubernetes
+}

applications/module.tf

@@ -15,8 +15,8 @@ provider "kubernetes" {
 
 
 provider "bitwarden-secrets" {
-  api_url         = "https://bitwarden.tryton.geeraert.eu/api"
+  api_url         = "https://bitwarden.geeraert.eu/api"
-  identity_url    = "https://bitwarden.tryton.geeraert.eu/identity"
+  identity_url    = "https://bitwarden.geeraert.eu/identity"
   access_token    = "0.9f4b7c5f-e6e7-4eff-929e-b474016a2b9c.bMRELajGGb7qMuXXvzgCCJdDfxfTCS:mFDT7tHSi43KJSnkwvTSYg=="
   organization_id = "a6361589-badd-4bde-9cb4-af8901161c0d"
 }
@@ -26,7 +26,7 @@ variable "kubernetes" {
     name  = optional(string)
     image = string
     pvc = optional(map(object({
-      name                 = string
+      name                 = optional(string)
       pvc                  = optional(bool, false)
       config_map           = optional(bool, false)
       secret               = optional(bool, false)
@@ -56,6 +56,8 @@ variable "kubernetes" {
     service_type           = optional(string, "ClusterIP")
     service_name           = optional(string)
     domain_name            = optional(list(string))
+    legacy_domain          = optional(bool, false)
+    exposed                = optional(bool, true)
     liveness_tcp_socket    = optional(number)
     liveness_http_get      = optional(string)
     liveness_http_get_path = optional(string)
@@ -80,77 +82,20 @@ variable "kubernetes" {
     service_account_name  = optional(string)
     environment_variables = optional(map(string), { name = "value" })
     security_context      = optional(bool, false)
+    import_database_secret = optional(object({
+      #putting them a non optional as the code doesn't allow optional value 
+      host     = string
+      name     = string
+      password = string
+      port     = string
+      username = string
+    }))
   }))
 
 }
 
-variable "database_backup_info" {
-  type = map(object({
-    image   = optional(string)
-    command = optional(string)
-  }))
-  description = "based on DB engine, give the docker image and the command used to backup"
-  default = {
-    postgres = {
-      image   = "alpine/psql"
-      command = "pg_dump |gzip -9 > /backup/$(DB_DATABASE_NAME)-DB-$(date +%Y%m%d).sql.gz"
-    }
-    mysql = {
-      image   = "mysql"
-      command = "mysqldump -h $DB_HOST -u $MYSQL_USER -p$MYSQL_ROOT_PASSWORD $MYSQL_DATABASE |gzip -9 > /backup/$(DB_DATABASE_NAME)-DB-$(date +%Y%m%d).sql.gz"
-    }
-    sqlserver = {
-      image   = "mcr.microsoft.com/mssql-tools"
-      command = "/opt/mssql-tools/bin/sqlcmd -S $DB_HOST -U $DB_USERNAME -P $DB_PASSWORD -Q \"BACKUP DATABASE $DB_DATABASE_NAME TO DISK = '/backup/$DB_DATABASE_NAME-$(date +%Y%m%d).bak' WITH  COPY_ONLY, CHECKSUM,FORMAT, MEDIANAME = 'SQLServerBackups',NAME = 'Full Backup of SQLTestDB'\";exit"
-    }
-  }
-}
-
-locals {
-  pvc_list = flatten([
-    for key, value in var.kubernetes : [
-      for index, pvc in value.pvc : {
-        key                  = "${coalesce(value.namespace, value.connected_namespace, key)}/${pvc.name}"
-        index                = index
-        pvc                  = pvc.pvc
-        name                 = pvc.name
-        pvc_size             = pvc.pvc_size
-        mount_path           = pvc.mount_path
-        storage_class_name   = pvc.storage_class_name
-        annotations_fileType = pvc.annotations_fileType
-        existing_pvc         = pvc.existing_pvc
-        sub_path             = pvc.sub_path
-        namespace            = coalesce(value.namespace, value.connected_namespace, key)
-    }] if value.enabled == true && value.pvc != null
-  ])
-
-  # group duplicates instead of throwing an error
-  pvc_map_grouped = {
-    for p in local.pvc_list :
-    p.key => p...
-  }
-
-  # keep only one PVC per key (take the first)
-  pvc_map = {
-    for k, list in local.pvc_map_grouped :
-    k => list[0]
-  }
-
-  pvc_details = values(local.pvc_map)
-}
-
-locals {
-  env_details = flatten([
-    for key, value in var.kubernetes : [
-      for index, env in value.environment_variables : {
-        index = index
-        name  = env
-    }] if value.enabled == true && value.environment_variables != null
-  ])
-}
 
 
-data "kubernetes_all_namespaces" "allns" {}
 
 resource "kubernetes_namespace_v1" "automatic" {
   for_each = { for key, value in var.kubernetes : key => value if value.enabled == true && value.connected_namespace == "" }
@@ -163,7 +108,6 @@ resource "kubernetes_namespace_v1" "automatic" {
     }
     name = coalesce(each.value.namespace, each.key)
   }
-  depends_on = [data.kubernetes_all_namespaces.allns]
 }
 
 locals {
@@ -188,870 +132,3 @@ resource "kubernetes_manifest" "manifest" {
   provider = kubernetes
 }
 
-
-
-resource "kubernetes_persistent_volume_claim_v1" "automatic-pvc" {
-  for_each = { for key, value in local.pvc_details : "${value.index}" => merge(value, { mew_key = value.index }) if value.pvc && value.existing_pvc != true }
-  metadata {
-    namespace = coalesce(each.value.namespace, each.key)
-    name      = "${each.value.name}-pvc"
-    labels = {
-      deployment_method = "Terraform"
-    }
-    annotations = {
-      fileType = try(each.value.annotations_fileType, "file")
-    }
-
-  }
-
-  spec {
-    access_modes       = ["ReadWriteMany"]
-    storage_class_name = each.value.storage_class_name
-    resources {
-      requests = {
-        storage = each.value.pvc_size
-      }
-    }
-  }
-}
-resource "kubernetes_persistent_volume_claim_v1" "automatic-pvc-database" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true && !(try(value.database.shunt, false)) }
-  metadata {
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = "${each.key}-db-pvc"
-    labels = {
-      deployment_method = "Terraform"
-    }
-  }
-  spec {
-    access_modes       = ["ReadWriteMany"]
-    storage_class_name = "nfs-storage-intelligent"
-    resources {
-      requests = {
-        storage = "1Gi"
-      }
-    }
-  }
-}
-
-resource "kubernetes_persistent_volume_claim_v1" "backup-pvc-database" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  metadata {
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = "${each.key}-db-backup"
-    labels = {
-      deployment_method = "Terraform"
-    }
-    annotations = {
-    fileType = "Backup" }
-  }
-  spec {
-    access_modes       = ["ReadWriteMany"]
-    storage_class_name = "nfs-storage-fastaccess"
-    resources {
-      requests = {
-        storage = "1Gi"
-      }
-    }
-  }
-}
-
-resource "kubernetes_persistent_volume_claim_v1" "automatic-pvc-redis" {
-  for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
-  metadata {
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = "${each.key}-redis-pvc"
-    labels = {
-      deployment_method = "Terraform"
-    }
-  }
-  spec {
-    access_modes       = ["ReadWriteMany"]
-    storage_class_name = "nfs-storage-intelligent"
-    resources {
-      requests = {
-        storage = "1Gi"
-      }
-    }
-  }
-}
-
-resource "kubernetes_service_v1" "automatic_service" {
-  for_each = { for key, value in var.kubernetes : key => value if value.service_port != null && value.enabled == true }
-  metadata {
-    name      = "${each.key}-svc"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    labels = {
-      deployment_method = "Terraform"
-    }
-    annotations = each.value.service_type == "LoadBalancer" ? {
-      "metallb.universe.tf/ip-allocated-from-pool" = "first-pool"
-    } : {}
-
-
-
-  }
-  spec {
-    selector = {
-      app = each.key
-    }
-    dynamic "port" {
-      for_each = each.value.service_port != null ? each.value.service_port : []
-      content {
-        port        = port.value
-        target_port = port.value
-        name        = replace("${port.value}${each.key}", "/(.{0,15})(.*)/", "$1")
-
-      }
-    }
-
-    #    port {
-    #      port        = each.value.service_port
-    #      target_port = each.value.service_port
-    #    }
-    type = each.value.service_type
-
-
-  }
-
-
-}
-
-resource "kubernetes_service_v1" "automatic_service_database" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true && !(try(value.database.shunt, false)) }
-  metadata {
-    name      = "${each.key}-db-svc"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    labels = {
-      deployment_method = "Terraform"
-      #username          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_password[each.key].key}"
-    }
-  }
-  spec {
-    selector = {
-      app = "${each.key}-db"
-    }
-    port {
-      port        = try(each.value.database.port, 5432)
-      target_port = try(each.value.database.port, 5432)
-    }
-
-  }
-
-
-}
-
-
-
-resource "kubernetes_service_v1" "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.value.connected_namespace, each.key)
-    labels = {
-      deployment_method = "Terraform"
-    }
-  }
-  spec {
-    selector = {
-      app = "${each.key}-redis"
-    }
-    port {
-      port        = 6379
-      target_port = 6379
-    }
-  }
-}
-
-
-
-resource "kubernetes_deployment_v1" "automatic" {
-  for_each = { for key, value in var.kubernetes : key => value if value.enabled == true }
-  metadata {
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = coalesce(each.value.name, each.key)
-
-    labels = {
-      app               = each.key
-      deployment_method = "Terraform"
-    }
-  }
-
-  spec {
-    replicas = each.value.replicas
-
-    selector {
-      match_labels = {
-        app = each.key
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app               = each.key
-          deployment_method = "Terraform"
-        }
-      }
-
-      spec {
-        container {
-          image = each.value.image
-          name  = coalesce(each.value.name, each.key)
-          dynamic "port" {
-            for_each = each.value.service_port != null ? each.value.service_port : []
-            content {
-              container_port = port.value
-              #              name           = "${each.key}-${port.value}"
-              name = replace("${port.value}${each.key}", "/(.{0,15})(.*)/", "$1")
-            }
-          }
-
-
-          dynamic "volume_mount" {
-            for_each = each.value.pvc != null ? each.value.pvc : {}
-            content {
-              mount_path = volume_mount.value.mount_path
-              name       = "${volume_mount.value.name}-pvc"
-              sub_path   = volume_mount.value.sub_path != null ? volume_mount.value.sub_path : ""
-            }
-          }
-
-          dynamic "volume_mount" {
-            for_each = try(each.value.database.engine == "sqlserver", false) && try(each.value.database.shunt, false) ? [1] : []
-            content {
-              mount_path = "/backup"
-              name       = "${each.key}-db-backup"
-            }
-          }
-
-          dynamic "env_from" {
-            for_each = each.value.secret_ref != null ? each.value.secret_ref : []
-            content {
-              dynamic "secret_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-
-            }
-          }
-          dynamic "env_from" {
-            for_each = each.value.database != null && each.value.enabled == true && !(try(each.value.database.shunt, false)) ? ["${each.key}-db-terraform"] : []
-            #for_each = each.value.database != null && each.value.enabled == true  ? ["${each.key}-db-terraform"] : []
-            content {
-              dynamic "secret_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-            }
-          }
-          dynamic "env_from" {
-            for_each = each.value.database != null && each.value.enabled == true ? ["${each.key}-db-mapped-terraform"] : []
-            content {
-              dynamic "secret_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-            }
-          }
-          dynamic "env_from" {
-            for_each = each.value.config_map_ref != null ? each.value.config_map_ref : []
-            content {
-              dynamic "config_map_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-            }
-          }
-
-          command = each.value.command != null ? each.value.command : []
-
-
-          dynamic "env" {
-            for_each = each.value.environment != null ? each.value.environment : {}
-            content {
-              name  = env.key
-              value = env.value.value != null ? env.value.value : null
-              dynamic "value_from" {
-                for_each = env.value.value_from != null ? env.value.value_from : {}
-                content {
-                  dynamic "secret_key_ref" {
-                    for_each = [1]
-                    content {
-                      name = env.value.value_from.secret_key_ref.name
-                      key  = env.value.value_from.secret_key_ref.key
-                    }
-                  }
-                }
-              }
-
-            }
-          }
-          dynamic "resources" {
-            for_each = each.value.requirements != null ? [1] : []
-            content {
-              limits = {
-                cpu    = each.value.requirements.limits-cpu
-                memory = each.value.requirements.limits-memory
-              }
-              requests = {
-                cpu    = each.value.requirements.requests-cpu
-                memory = each.value.requirements.requests-memory
-              }
-
-            }
-          }
-
-
-          dynamic "security_context" {
-            for_each = each.value.security_context == true ? [1] : []
-            content {
-              privileged = true
-              #capabilities = {
-              #  add : ["NET_ADMIN", "NET_RAW"]
-              #}
-            }
-          }
-          dynamic "liveness_probe" {
-            for_each = each.value.liveness_tcp_socket != null || each.value.liveness_http_get != null ? [""] : []
-            content {
-              dynamic "tcp_socket" {
-                for_each = each.value.liveness_tcp_socket != null ? [""] : []
-                content {
-                  port = each.value.liveness_tcp_socket
-                }
-              }
-
-              dynamic "http_get" {
-                for_each = each.value.liveness_http_get != null ? [""] : []
-                content {
-                  port = each.value.liveness_http_get
-                  path = coalesce(each.value.liveness_http_get_path, "/")
-                }
-              }
-
-              initial_delay_seconds = 3
-              period_seconds        = 3
-            }
-          }
-        }
-        dynamic "dns_config" {
-          for_each = each.value.dns_nameservers != null ? [1] : []
-          content {
-            nameservers = [each.value.dns_nameservers]
-          }
-
-        }
-        service_account_name = each.value.service_account_name != null ? each.value.service_account_name : null
-
-        dynamic "volume" {
-          for_each = each.value.pvc != null ? each.value.pvc : {}
-          content {
-            name = "${volume.value.name}-pvc"
-
-            dynamic "persistent_volume_claim" {
-              for_each = volume.value.pvc ? [1] : []
-              content {
-                claim_name = "${volume.value.name}-pvc"
-              }
-            }
-
-            dynamic "config_map" {
-              for_each = volume.value.config_map ? [1] : []
-              content {
-                name = volume.value.name
-              }
-            }
-
-            dynamic "host_path" {
-              for_each = volume.value.host_path != null ? [1] : []
-              content {
-                path = volume.value.host_path
-              }
-            }
-
-            dynamic "secret" {
-              for_each = volume.value.secret ? [1] : []
-              content {
-                secret_name = volume.value.name
-              }
-            }
-
-          }
-        }
-        dynamic "volume" {
-          for_each = try(each.value.database.engine == "sqlserver", false) && try(each.value.database.shunt, false) ? [1] : []
-          content {
-            name = "${each.key}-db-backup"
-
-            persistent_volume_claim {
-              claim_name = "${each.key}-db-backup"
-            }
-          }
-        }
-
-      }
-    }
-  }
-  depends_on = [kubernetes_persistent_volume_claim_v1.automatic-pvc]
-}
-
-
-
-resource "kubernetes_deployment_v1" "database-automatic" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true && !(try(value.database.shunt, false)) }
-
-
-  metadata {
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = "${coalesce(each.value.name, each.key)}-db"
-    labels = {
-      app               = each.key
-      deployment_method = "Terraform"
-      database          = "true"
-    }
-  }
-
-  spec {
-    replicas = each.value.replicas
-
-    selector {
-      match_labels = {
-        app = "${each.key}-db"
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app               = "${each.key}-db"
-          deployment_method = "Terraform"
-          database          = "true"
-        }
-      }
-
-      spec {
-        container {
-          image = try(each.value.database.image, "docker.io/library/postgres:latest")
-          name  = "${coalesce(each.value.name, each.key)}-db"
-          port {
-
-            container_port = 5432
-            name           = "database-port"
-
-          }
-
-          volume_mount {
-            mount_path = try(each.value.database.mountPath, "/var/lib/postgresql/")
-            name       = "${each.key}-db-pvc"
-          }
-
-          dynamic "volume_mount" {
-            for_each = try(each.value.database.engine == "sqlserver", false) && !(try(each.value.database.shunt, false)) ? [1] : []
-            content {
-              mount_path = "/backup"
-              name       = "${each.key}-db-backup"
-            }
-          }
-
-          command = try([each.value.database.command], [])
-          args    = each.value.database_args != null ? each.value.database_args : []
-
-          dynamic "env_from" {
-            for_each = each.value.database != null && each.value.enabled == true && !(try(each.value.database.shunt, false)) ? ["${each.key}-db-terraform"] : []
-            content {
-              dynamic "secret_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-            }
-          }
-
-          dynamic "env" {
-            for_each = each.value.environment != null ? each.value.environment : {}
-            content {
-              name  = env.key
-              value = env.value.value != null ? env.value.value : null
-              dynamic "value_from" {
-                for_each = env.value.value_from != null ? env.value.value_from : {}
-                content {
-                  dynamic "secret_key_ref" {
-                    for_each = [1]
-                    content {
-                      name = env.value.value_from.secret_key_ref.name
-                      key  = env.value.value_from.secret_key_ref.key
-                      #                     optional = true
-                    }
-                  }
-                }
-              }
-
-            }
-          }
-
-
-        }
-
-
-        volume {
-          name = "${each.key}-db-pvc"
-          persistent_volume_claim {
-            claim_name = "${each.key}-db-pvc"
-          }
-        }
-
-        dynamic "volume" {
-          for_each = try(each.value.database.engine == "sqlserver", false) && !(try(each.value.database.shunt, false)) ? [1] : []
-          content {
-            name = "${each.key}-db-backup"
-
-            persistent_volume_claim {
-              claim_name = "${each.key}-db-backup"
-            }
-          }
-        }
-
-      }
-    }
-  }
-}
-
-
-resource "kubernetes_cron_job_v1" "database-backup" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  metadata {
-    name      = "${coalesce(each.value.namespace, each.key)}-db-backup"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    labels = {
-      app               = each.key
-      deployment_method = "Terraform"
-      database          = "true"
-    }
-  }
-  spec {
-    failed_jobs_history_limit     = 5
-    schedule                      = "1 0 * * *"
-    timezone                      = "Etc/UTC"
-    successful_jobs_history_limit = 5
-    job_template {
-      metadata {}
-      spec {
-        backoff_limit              = 4
-        ttl_seconds_after_finished = 100
-        template {
-          metadata {}
-          spec {
-            container {
-              name    = "${coalesce(each.value.namespace, each.key)}-db-backup"
-              image   = try(var.database_backup_info[each.value.database.engine].image, var.database_backup_info.postgres.image)
-              command = ["/bin/sh", "-c"]
-              args    = [try(var.database_backup_info[each.value.database.engine].command, var.database_backup_info.postgres.command)]
-              env_from {
-                secret_ref {
-                  name = "${each.key}-db-terraform"
-                }
-              }
-              volume_mount {
-                mount_path = "/backup"
-                name       = "${each.key}-db-backup"
-              }
-            }
-            volume {
-              name = "${each.key}-db-backup"
-              persistent_volume_claim {
-                claim_name = "${each.key}-db-backup"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
-
-resource "kubernetes_deployment_v1" "redis-automatic" {
-  for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
-
-
-  metadata {
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = "${coalesce(each.value.name, each.key)}-redis"
-    labels = {
-      app               = each.key
-      deployment_method = "Terraform"
-      redis             = "true"
-    }
-  }
-
-  spec {
-    replicas = each.value.replicas
-
-    selector {
-      match_labels = {
-        app = "${each.key}-redis"
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app               = "${each.key}-redis"
-          deployment_method = "Terraform"
-          redis             = "true"
-        }
-      }
-
-      spec {
-        container {
-          image = try(each.value.redis.image, "docker.io/library/redis:7")
-          name  = "${coalesce(each.value.name, each.key)}-redis"
-          port {
-
-            container_port = 6379
-            name           = "redis-port"
-
-          }
-
-          volume_mount {
-            mount_path = "/data"
-            name       = "${each.key}-redis-pvc"
-          }
-
-
-
-
-
-          dynamic "env" {
-            for_each = each.value.environment != null ? each.value.environment : {}
-            content {
-              name  = env.key
-              value = env.value.value != null ? env.value.value : null
-              dynamic "value_from" {
-                for_each = env.value.value_from != null ? env.value.value_from : {}
-                content {
-                  dynamic "secret_key_ref" {
-                    for_each = [1]
-                    content {
-                      name = env.value.value_from.secret_key_ref.name
-                      key  = env.value.value_from.secret_key_ref.key
-                      #                    optional = true
-                    }
-                  }
-                }
-              }
-
-            }
-          }
-
-
-          #          resources {
-          #            limits = {
-          #              cpu    = each.value.requirements.limits-cpu
-          #              memory = each.value.requirements.limits-memory
-          #            }
-          #            requests = {
-          #              cpu    = each.value.requirements.requests-cpu
-          #              memory = each.value.requirements.requests-memory
-          #            }
-          #          }
-
-          #          dynamic "liveness_probe" {
-          #            for_each = each.value.liveness_tcp_socket != null || each.value.liveness_http_get != null ? [""] : []
-          #           content {
-          #              dynamic "tcp_socket" {
-          #                for_each = each.value.liveness_tcp_socket != null ? [""] : []
-          #                content {
-          #                  port = each.value.liveness_tcp_socket
-          #                }
-          #              }
-
-
-          #              dynamic "http_get" {
-          #                for_each = each.value.liveness_http_get != null ? [""] : []
-          #                content {
-          #                  port = each.value.liveness_http_get
-          #                  path = coalesce(each.value.liveness_http_get_path, "/")
-          #                }
-          #              }
-
-          #              initial_delay_seconds = 3
-          #              period_seconds        = 3
-          #            }
-          #          }
-        }
-
-
-        volume {
-          name = "${each.key}-redis-pvc"
-          persistent_volume_claim {
-            claim_name = "${each.key}-redis-pvc"
-          }
-        }
-
-      }
-    }
-  }
-}
-
-resource "kubernetes_config_map_v1" "automatic-configmap" {
-  metadata {
-    name      = "extra-sites-terraform"
-    namespace = "reverse-proxy"
-    annotations = {
-      "reloader.stakater.com/match" : "true",
-    }
-  }
-
-  data = {
-    for key, value in var.kubernetes :
-    "${value.domain_name}.conf" => templatefile("nginx_config.tftpl", {
-      name_site    = value.domain_name
-      name_service = "${key}-svc.${coalesce(value.namespace, value.connected_namespace, key)}.svc:${value.service_port.0}"
-    }) if value.domain_name != null && value.enabled == true
-  }
-
-}
-
-data "bitwarden-secrets_secret" "configmap_import" {
-  for_each = {
-    for pair in flatten([
-      for k, v in var.kubernetes : [
-        for id in v.config_map_import : {
-          map_key   = k
-          secret_id = id
-        }
-      ] if v.config_map_import != null && v.enabled == true
-    ]) : "${pair.map_key}-${pair.secret_id}" => pair.secret_id
-  }
-  id = each.value
-}
-
-resource "kubernetes_config_map_v1" "configmap_import" {
-  for_each = { for key, value in data.bitwarden-secrets_secret.configmap_import : key => value }
-  metadata {
-    name      = each.value.note
-    namespace = split("__", each.value.key)[0]
-  }
-  data = yamldecode(each.value.value)
-}
-
-
-data "bitwarden-secrets_secret" "secret_import" {
-  for_each = {
-    for pair in flatten([
-      for k, v in var.kubernetes : [
-        for id in v.secret_import : {
-          map_key   = k
-          secret_id = id
-        }
-      ] if v.secret_import != null && v.enabled == true
-    ]) : "${pair.map_key}-${pair.secret_id}" => pair.secret_id
-  }
-  id = each.value
-}
-
-resource "kubernetes_secret_v1" "secret_import" {
-  for_each = { for key, value in data.bitwarden-secrets_secret.secret_import : key => value }
-  metadata {
-    name      = each.value.note
-    namespace = split("__", each.value.key)[0]
-  }
-  data = yamldecode(each.value.value)
-}
-
-
-resource "kubernetes_secret_v1" "automatic-database-secret" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  metadata {
-    name      = "${each.key}-db-terraform"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-  }
-
-  data = {
-    DB_DATABASE_NAME    = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    DB_DATABASE         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    POSTGRES_DB         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    MYSQL_DATABASE      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    PGDATABASE          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    DB_HOST             = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
-    PGHOST              = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
-    POSTGRES_HOST       = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
-    DB_PASSWORD         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    MYSQL_PASSWORD      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    MYSQL_ROOT_PASSWORD = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    POSTGRES_PASSWORD   = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    PGPASSWORD          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    DB_USERNAME         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-    POSTGRES_USER       = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-    MYSQL_USER          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-    PGUSER              = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-    DATABASE_URL        = "postgresql://${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}:${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}@${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}:${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_port[each.key].value}/${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-  }
-
-}
-
-resource "kubernetes_secret_v1" "automatic-database-mapped-secret" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  metadata {
-    name      = "${each.key}-db-mapped-terraform"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-  }
-
-  data = {
-    "${try(each.value.database.map_name, "DB_DATABASE_NAME")}"     = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    "${try(each.value.database.map_host, "DB_DATABASE_NAME")}"     = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
-    "${try(each.value.database.map_password, "DB_DATABASE_NAME")}" = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    "${try(each.value.database.map_username, "DB_DATABASE_NAME")}" = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-  }
-}
-
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_username" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key        = "${each.key}__db__username"
-  value      = try(each.value.database.username, each.key)
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_password" {
-  for_each        = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key             = "${each.key}__db__password"
-  project_id      = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  length          = 32
-  special         = true
-  min_special     = 5
-  avoid_ambiguous = true
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_host" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key        = "${each.key}__db__host"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.database.host, "${each.key}-db-svc.${coalesce(each.value.namespace, each.value.connected_namespace, each.key)}.svc")
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_port" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key        = "${each.key}__db__port"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.database.port, 5432)
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_name" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key        = "${each.key}__db__name"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.database.name, each.key)
-}
-

applications/redis.tf

@@ -1,56 +1,7 @@
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_host" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
-  key        = "${each.key}__redis__host"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.redis.host, "${each.key}-redis-svc.${coalesce(each.value.namespace, each.value.connected_namespace, each.key)}.svc")
-}
 
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_port" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
-  key        = "${each.key}__redis__port"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.redis.port, 5432)
-}
 
-##
-## Commenting until I use the redis password option
-##
-#resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_password" {
-#  for_each        = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
-#  key             = "${each.key}__redis__password"
-#  project_id      = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-#  length          = 32
-#  special         = true
-#  min_special     = 5
-#  avoid_ambiguous = true
-#}
 
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_REPLICATION_MODE" {
+module "Redis-automatic" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
+  source           = "../modules/redis"
-  key        = "${each.key}__redis__REPLICATION_MODE"
+  kubernetes_input = var.kubernetes
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.redis.REPLICATION_MODE, "master")
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_TLS_ENABLED" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
-  key        = "${each.key}__redis__TLS_ENABLED"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.redis.TLS_ENABLED, "no")
-}
-
-resource "kubernetes_secret_v1" "automatic-redis-secret" {
-  for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
-  metadata {
-    name      = "${each.key}-redis-terraform"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-  }
-
-  data = {
-    REDIS_HOSTNAME         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_redis_host[each.key].value}"
-    REDIS_PORT             = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_redis_port[each.key].value}"
-    REDIS_REPLICATION_MODE = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_redis_REPLICATION_MODE[each.key].value}"
-    REDIS_TLS_ENABLED      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_redis_TLS_ENABLED[each.key].value}"
-  }
-
 }

applications/secrets.tf

@@ -0,0 +1,4 @@
+module "Secrets-automatic" {
+  source           = "../modules/secrets"
+  kubernetes_input = var.kubernetes
+}

applications/variables.auto.tfvars

@@ -1,6 +1,6 @@
 kubernetes = {
   bookstack = {
-    #enabled      = false
+    enabled      = false
     replicas     = 01
     image        = "linuxserver/bookstack:latest"
     service_port = [80, 443]
@@ -129,7 +129,7 @@ kubernetes = {
 
 
   stash = {
-    #  enabled      = false
+    enabled  = false ##was enabled
     replicas = 0
     name     = "stash"
     #image        = "stashapp/stash:latest"
@@ -334,7 +334,7 @@ kubernetes = {
 
 
   paperless = {
-    #enabled   = false
+    enabled = false ##was
     #namespace = "paper"
     #replicas       = 0
     image        = "ghcr.io/paperless-ngx/paperless-ngx:2.18.4"
@@ -463,7 +463,7 @@ kubernetes = {
     }
   }
   gotenberg = {
-    #enabled             = false
+    enabled             = false ##was enabled
     name                = "gotenberg"
     command             = ["gotenberg", "--chromium-disable-javascript=true", "--chromium-allow-list=file:///tmp/.*", "--chromium-auto-start"]
     connected_namespace = "paperless"
@@ -523,7 +523,7 @@ kubernetes = {
 
   }
   tika = {
-    #enabled             = false
+    enabled             = false ##was enabled    
     name                = "tika"
     connected_namespace = "paperless"
     image               = "docker.io/apache/tika:latest"
@@ -584,58 +584,39 @@ kubernetes = {
 
 
   nextcloud = {
-    enabled   = false
+    #enabled       = false
     namespace = "next"
-    #replicas     = 0
+    #replicas      = 0
-    image        = "nextcloud:29.0.3-apache"
+    image         = "nextcloud:29.0.3-apache"
-    domain_name  = ["next"]
+    domain_name   = ["nextcloud"]
-    service_port = [80]
+    service_port  = [80]
-    #extra_manifest = ["/opt/kubernetes/Nextcloud_kube/next.secret.yaml"]
     secret_ref    = ["nextcloud-credentials"]
     secret_import = ["b207c4b6-0489-4ab2-a032-b4a400a708e0"]
     database = {
-    image = "docker.io/library/postgres:14" }
+      image     = "docker.io/library/postgres:14"
+      mountPath = "/var/lib/postgresql/data"
+    }
     redis = {
     image = "docker.io/library/redis:7" }
-    #requirements = {
-    #  limits-cpu      = "800Mi"
-    #  limits-memory   = "800Mi"
-    #  requests-cpu    = "800Mi"
-    #  requests-memory = "800Mi"
-    #}
     environment = {
 
       TRUSTED_PROXIES = {
         value = "192.168.88.50 192.168.88.52"
       }
       OVERWRITECLIURL = {
-        value = "https://next.geeraert.eu"
+        value = "https://nextcloud.geeraert.eu"
       }
       OVERWRITEPROTOCOL = {
         value = "https"
       }
 
       NEXTCLOUD_TRUSTED_DOMAINS = {
-        value = "next.geeraert.eu next.tryton.geeraert.eu 192.168.88.52"
+        value = "nextcloud.geeraert.eu nextcloud.tryton.geeraert.eu 192.168.0.200"
       }
-      NEXTCLOUD_ADMIN_USER = {
-        value = "admin"
-      }
-      NEXTCLOUD_ADMIN_PASSWORD = {
-        value_from = {
-          secret_key_ref = {
-            name = "nextcloud-credentials"
-            key  = "PI_USER_PASSWORD"
-          }
-        }
-      }
-
     }
     pvc = {
       nextcloud-webserver = {
         name       = "nextcloud-webserver"
-        pvc_size   = "2Mi"
-        pvc        = true
         mount_path = "/var/www/html"
       }
     }
@@ -835,7 +816,7 @@ kubernetes = {
 
 
   prowlarr = {
-    #    enabled             = false
+    enabled   = false ##was enabled
     image     = "linuxserver/prowlarr:latest"
     namespace = "servarr"
     #replicas       = 0
@@ -908,7 +889,7 @@ kubernetes = {
   }
 
   radarr = {
-    #enabled             = false
+    enabled             = false ##was enabled
     image               = "lscr.io/linuxserver/radarr:latest"
     connected_namespace = "servarr"
     #replicas       = 0
@@ -951,7 +932,7 @@ kubernetes = {
 
 
   sonarr = {
-    #enabled             = false
+    enabled             = false ##was enabled
     image               = "lscr.io/linuxserver/sonarr:latest"
     connected_namespace = "servarr"
     #replicas       = 0
@@ -1026,7 +1007,7 @@ kubernetes = {
 
   }
   qbittorrent = {
-    #enabled             = false
+    enabled             = false ##was enabled
     image               = "lscr.io/linuxserver/qbittorrent:latest"
     connected_namespace = "servarr"
     service_port        = [8080]
@@ -1072,13 +1053,13 @@ kubernetes = {
 
 
   flaresolverr = {
+    enabled = false ##was enabled
     #image               = "ghcr.io/flaresolverr/flaresolverr:latest"
     image = "alexfozor/flaresolverr:pr-1300-experimental"
 
     connected_namespace = "servarr"
-    #enabled             = false
+    image               = "ghcr.io/flaresolverr/flaresolverr:latest"
-    image        = "ghcr.io/flaresolverr/flaresolverr:latest"
+    service_port        = [8191]
-    service_port = [8191]
 
     environment = {
       PUID = {
@@ -1138,9 +1119,9 @@ kubernetes = {
   }
 
   wikijs = {
-    #enabled        = false
+    enabled        = false ##was enabled
-    image        = "ghcr.io/requarks/wiki:2.5"
+    image          = "ghcr.io/requarks/wiki:2.5"
-    service_port = [3000]
+    service_port   = [3000]
     extra_manifest = ["/opt/kubernetes/Terraform_kube/external_manifests/wikijs/wikijs-db.secret.yaml"]
     database = {
       image     = "postgres:17"
@@ -1227,7 +1208,7 @@ kubernetes = {
   }
 
   immich = {
-    #enabled = false
+    enabled = false ##was enabled
     #replicas     = 0
     connected_namespace = "immich"
     image               = "ghcr.io/immich-app/immich-server:v3.0.0"
@@ -1355,7 +1336,7 @@ kubernetes = {
     }
   }
   machinelearning = {
-    #enabled = false
+    enabled = false ##was enabled
     #replicas = 0
     connected_namespace = "immich"
     image               = "ghcr.io/immich-app/immich-machine-learning:v2.5.6"

core/module.tf

@@ -93,20 +93,6 @@ variable "storage_path" {
   }
 }
 
-
-locals {
-  env_details = flatten([
-    for key, value in var.kubernetes : [
-      for index, env in value.environment_variables : {
-        index = index
-        name  = env
-    }] if value.enabled == true && value.environment_variables != null && value.docker != true
-  ])
-}
-
-
-
-
 locals {
   kubernetes_manifests = flatten([
     for k, obj in var.kubernetes : [

core/variables.auto.tfvars

@@ -6,6 +6,7 @@ kubernetes = {
     service_port  = [4580]
     external_port = true
     service_type  = "NodePort"
+    domain_name   = ["echo", "hello"]
     #command       = ["-text=Hello authenticated world!"]
     pvc = {
       echo-config = {
@@ -131,7 +132,7 @@ kubernetes = {
     connected_namespace = "bitwarden"
     replicas            = 1
     name                = "bitwarden-api"
-    image               = "gitea.tryton.geeraert.eu/pi-ux-ce/bitbetter_api:2026.1.0"
+    image               = "gitea.geeraert.eu/pi-ux-ce/bitbetter_api:2026.1.0"
     service_port        = [5000]
     exposed             = false
     config_map_ref      = ["global.env", "uid.env", "global.override.env"]
@@ -223,7 +224,7 @@ kubernetes = {
     connected_namespace = "bitwarden"
     replicas            = 1
     name                = "bitwarden-identity"
-    image               = "gitea.tryton.geeraert.eu/pi-ux-ce/bitbetter_identity:2026.1.0"
+    image               = "gitea.geeraert.eu/pi-ux-ce/bitbetter_identity:2026.1.0"
     service_port        = [5000]
     exposed             = false
     config_map_ref      = ["global.env", "uid.env", "global.override.env"]

external_manifests/bitwarden/global.override.env.configmap.yml

@@ -2,7 +2,7 @@ apiVersion: v1
 data:
   ACCEPT_EULA: "Y"
   adminSettings__admins: pierre@geeraert.eu
-  globalSettings__baseServiceUri__vault: http://bitwarden.tryton.geeraert.eu
+  globalSettings__baseServiceUri__vault: http://bitwarden.geeraert.eu
   globalSettings__disableUserRegistration: "false"
   globalSettings__duo__aKey: p9jCHtnG4NZNZu4SThpVlCuOF1oePGhu53Wa4RJwuyeqRAWQ0aJN7GsKYrGbYIYO
   globalSettings__hibpApiKey: REPLACE

infrastructure/database.tf

@@ -1,171 +1,4 @@
-resource "kubernetes_deployment_v1" "database-automatic" {
+module "Database-automatic" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true && !(try(value.database.shunt, false)) }
+  source           = "../modules/database"
-
+  kubernetes_input = var.kubernetes
-
-  metadata {
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = "${coalesce(each.value.name, each.key)}-db"
-    labels = {
-      app               = each.key
-      deployment_method = "Terraform"
-      database          = "true"
-    }
-  }
-
-  spec {
-    replicas = each.value.replicas
-
-    selector {
-      match_labels = {
-        app = "${each.key}-db"
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app               = "${each.key}-db"
-          deployment_method = "Terraform"
-          database          = "true"
-        }
-      }
-
-      spec {
-        container {
-          image = try(each.value.database.image, "docker.io/library/postgres:latest")
-          name  = "${coalesce(each.value.name, each.key)}-db"
-          port {
-
-            container_port = 5432
-            name           = "database-port"
-
-          }
-
-          volume_mount {
-            mount_path = try(each.value.database.mountPath, "/var/lib/postgresql/")
-            name       = "${each.key}-db-volume"
-          }
-
-          dynamic "volume_mount" {
-            for_each = try(each.value.database.engine == "sqlserver", false) && !(try(each.value.database.shunt, false)) ? [1] : []
-            content {
-              mount_path = "/backup"
-              name       = "${each.key}-db-backup"
-            }
-          }
-
-          command = try([each.value.database.command], [])
-          args    = each.value.database_args != null ? each.value.database_args : []
-
-          dynamic "env_from" {
-            for_each = each.value.database != null && each.value.enabled == true && !(try(each.value.database.shunt, false)) ? ["${each.key}-db-terraform"] : []
-            content {
-              dynamic "secret_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-            }
-          }
-
-          dynamic "env" {
-            for_each = each.value.environment != null ? each.value.environment : {}
-            content {
-              name  = env.key
-              value = env.value.value != null ? env.value.value : null
-              dynamic "value_from" {
-                for_each = env.value.value_from != null ? env.value.value_from : {}
-                content {
-                  dynamic "secret_key_ref" {
-                    for_each = [1]
-                    content {
-                      name = env.value.value_from.secret_key_ref.name
-                      key  = env.value.value_from.secret_key_ref.key
-                    }
-                  }
-                }
-              }
-
-            }
-          }
-
-
-        }
-
-
-        volume {
-          name = "${each.key}-db-volume"
-          host_path {
-            path = try(each.value.database.host_path, join("/", [var.storage_path.main_storage, coalesce(each.value.namespace, each.value.connected_namespace, each.key), join("-", [each.key, "db"])]))
-          }
-        }
-
-        dynamic "volume" {
-          for_each = try(each.value.database.engine == "sqlserver", false) && !(try(each.value.database.shunt, false)) ? [1] : []
-          content {
-            name = "${each.key}-db-backup"
-
-            host_path {
-              path = join("/", [var.storage_path.fast_access, "Backup", coalesce(each.value.namespace, each.value.connected_namespace, each.key), "${each.key}-db-backup"])
-            }
-          }
-        }
-
-      }
-    }
-  }
-}
-
-
-resource "kubernetes_cron_job_v1" "database-backup" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  metadata {
-    name      = "${coalesce(each.value.namespace, each.key)}-db-backup"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    labels = {
-      app               = each.key
-      deployment_method = "Terraform"
-      database          = "true"
-    }
-  }
-  spec {
-    failed_jobs_history_limit     = 5
-    schedule                      = "1 0 * * *"
-    timezone                      = "Etc/UTC"
-    successful_jobs_history_limit = 5
-    job_template {
-      metadata {}
-      spec {
-        backoff_limit              = 4
-        ttl_seconds_after_finished = 100
-        template {
-          metadata {}
-          spec {
-            container {
-              name    = "${coalesce(each.value.namespace, each.key)}-db-backup"
-              image   = try(var.database_backup_info[each.value.database.engine].image, var.database_backup_info.postgres.image)
-              command = ["/bin/sh", "-c"]
-              args    = [try(var.database_backup_info[each.value.database.engine].command, var.database_backup_info.postgres.command)]
-              env_from {
-                secret_ref {
-                  name = "${each.key}-db-terraform"
-                }
-              }
-              volume_mount {
-                mount_path = "/backup"
-                name       = "${each.key}-db-backup"
-              }
-            }
-            volume {
-              name = "${each.key}-db-backup"
-              persistent_volume_claim {
-                claim_name = "${each.key}-db-backup"
-              }
-            }
-          }
-        }
-      }
-    }
-  }
 }

infrastructure/deployment.tf

@@ -9,234 +9,8 @@ module "services" {
   kubernetes_input = var.kubernetes
 }
 
-resource "kubernetes_deployment_v1" "automatic" {
+module "Deployment-automatic" {
-  for_each = { for key, value in var.kubernetes : key => value if value.enabled == true }
+  source           = "../modules/deployment"
-  metadata {
+  kubernetes_input = var.kubernetes
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = coalesce(each.value.name, each.key)
-
-    labels = {
-      app               = each.key
-      deployment_method = "Terraform"
-    }
-  }
-
-  spec {
-    replicas = each.value.replicas
-
-    selector {
-      match_labels = {
-        app = each.key
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app               = each.key
-          deployment_method = "Terraform"
-        }
-      }
-
-      spec {
-        container {
-          image = each.value.image
-          name  = coalesce(each.value.name, each.key)
-          dynamic "port" {
-            for_each = each.value.service_port != null ? each.value.service_port : []
-            content {
-              container_port = port.value
-              #              name           = "${each.key}-${port.value}"
-              name = replace("${port.value}${each.key}", "/(.{0,15})(.*)/", "$1")
-            }
-          }
-
-
-          dynamic "volume_mount" {
-            for_each = each.value.pvc != null ? each.value.pvc : {}
-            content {
-              mount_path = volume_mount.value.mount_path
-              name       = "${volume_mount.key}-volume"
-              sub_path   = volume_mount.value.sub_path != null ? volume_mount.value.sub_path : ""
-            }
-          }
-
-          dynamic "volume_mount" {
-            for_each = try(each.value.database.engine == "sqlserver", false) && try(each.value.database.shunt, false) ? [1] : []
-            content {
-              mount_path = "/backup"
-              name       = "${each.key}-db-backup"
-            }
-          }
-
-          dynamic "env_from" {
-            for_each = each.value.secret_ref != null ? each.value.secret_ref : []
-            content {
-              dynamic "secret_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-
-            }
-          }
-          dynamic "env_from" {
-            for_each = each.value.database != null && each.value.enabled == true && !(try(each.value.database.shunt, false)) ? ["${each.key}-db-terraform"] : []
-            #for_each = each.value.database != null && each.value.enabled == true  ? ["${each.key}-db-terraform"] : []
-            content {
-              dynamic "secret_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-            }
-          }
-          dynamic "env_from" {
-            for_each = each.value.database != null && each.value.enabled == true ? ["${each.key}-db-mapped-terraform"] : []
-            content {
-              dynamic "secret_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-            }
-          }
-          dynamic "env_from" {
-            for_each = each.value.config_map_ref != null ? each.value.config_map_ref : []
-            content {
-              dynamic "config_map_ref" {
-                for_each = [1]
-                content {
-                  name = env_from.value
-                }
-              }
-            }
-          }
-
-          command = each.value.command != null ? each.value.command : []
-
-
-          dynamic "env" {
-            for_each = each.value.environment != null ? each.value.environment : {}
-            content {
-              name  = env.key
-              value = env.value.value != null ? env.value.value : null
-              dynamic "value_from" {
-                for_each = env.value.value_from != null ? env.value.value_from : {}
-                content {
-                  dynamic "secret_key_ref" {
-                    for_each = [1]
-                    content {
-                      name = env.value.value_from.secret_key_ref.name
-                      key  = env.value.value_from.secret_key_ref.key
-                    }
-                  }
-                }
-              }
-
-            }
-          }
-          dynamic "resources" {
-            for_each = each.value.requirements != null ? [1] : []
-            content {
-              limits = {
-                cpu    = each.value.requirements.limits-cpu
-                memory = each.value.requirements.limits-memory
-              }
-              requests = {
-                cpu    = each.value.requirements.requests-cpu
-                memory = each.value.requirements.requests-memory
-              }
-
-            }
-          }
-
-
-          dynamic "security_context" {
-            for_each = each.value.security_context == true ? [1] : []
-            content {
-              privileged = true
-              #capabilities = {
-              #  add : ["NET_ADMIN", "NET_RAW"]
-              #}
-            }
-          }
-          dynamic "liveness_probe" {
-            for_each = each.value.liveness_tcp_socket != null || each.value.liveness_http_get != null ? [""] : []
-            content {
-              dynamic "tcp_socket" {
-                for_each = each.value.liveness_tcp_socket != null ? [""] : []
-                content {
-                  port = each.value.liveness_tcp_socket
-                }
-              }
-
-              dynamic "http_get" {
-                for_each = each.value.liveness_http_get != null ? [""] : []
-                content {
-                  port = each.value.liveness_http_get
-                  path = coalesce(each.value.liveness_http_get_path, "/")
-                }
-              }
-
-              initial_delay_seconds = 3
-              period_seconds        = 3
-            }
-          }
-        }
-        dynamic "dns_config" {
-          for_each = each.value.dns_nameservers != null ? [1] : []
-          content {
-            nameservers = [each.value.dns_nameservers]
-          }
-
-        }
-        service_account_name = each.value.service_account_name != null ? each.value.service_account_name : null
-
-        dynamic "volume" {
-          for_each = each.value.pvc != null ? each.value.pvc : {}
-          content {
-            name = "${volume.key}-volume"
-
-            dynamic "config_map" {
-              for_each = volume.value.config_map ? [1] : []
-              content {
-                name = volume.key
-              }
-            }
-
-            dynamic "host_path" {
-              for_each = volume.value.host_path != null || (!(volume.value.config_map) && !(volume.value.secret)) ? [1] : []
-              content {
-                path = coalesce(volume.value.host_path, join("/", [var.storage_path.main_storage, coalesce(each.value.namespace, each.value.connected_namespace, each.key), volume.key]))
-
-              }
-            }
-
-            dynamic "secret" {
-              for_each = volume.value.secret ? [1] : []
-              content {
-                secret_name = volume.key
-              }
-            }
-
-          }
-        }
-        dynamic "volume" {
-          for_each = try(each.value.database.engine == "sqlserver", false) && try(each.value.database.shunt, false) ? [1] : []
-          content {
-            name = "${each.key}-db-backup"
-
-            host_path {
-              path = join("/", [var.storage_path.fast_access, "Backup", coalesce(each.value.namespace, each.value.connected_namespace, each.key), "${each.key}-db-backup"])
-            }
-          }
-        }
-
-      }
-    }
-  }
 }
+

infrastructure/module.tf

@@ -13,14 +13,14 @@ provider "kubernetes" {
   config_path = "~/.kube/config"
 }
 
-
 provider "bitwarden-secrets" {
-  api_url         = "https://bitwarden.tryton.geeraert.eu/api"
+  api_url         = "https://bitwarden.geeraert.eu/api"
-  identity_url    = "https://bitwarden.tryton.geeraert.eu/identity"
+  identity_url    = "https://bitwarden.geeraert.eu/identity"
   access_token    = "0.9f4b7c5f-e6e7-4eff-929e-b474016a2b9c.bMRELajGGb7qMuXXvzgCCJdDfxfTCS:mFDT7tHSi43KJSnkwvTSYg=="
   organization_id = "a6361589-badd-4bde-9cb4-af8901161c0d"
 }
 
+
 variable "kubernetes" {
   type = map(object({
     name   = optional(string)
@@ -95,48 +95,6 @@ variable "kubernetes" {
 
 }
 
-variable "database_backup_info" {
-  type = map(object({
-    image   = optional(string)
-    command = optional(string)
-  }))
-  description = "based on DB engine, give the docker image and the command used to backup"
-  default = {
-    postgres = {
-      image   = "alpine/psql"
-      command = "pg_dump |gzip -9 > /backup/$(DB_DATABASE_NAME)-DB-$(date +%Y%m%d).sql.gz"
-    }
-    mysql = {
-      image   = "mysql"
-      command = "mysqldump -h $DB_HOST -u $MYSQL_USER -p$MYSQL_ROOT_PASSWORD $MYSQL_DATABASE |gzip -9 > /backup/$(DB_DATABASE_NAME)-DB-$(date +%Y%m%d).sql.gz"
-    }
-    sqlserver = {
-      image   = "mcr.microsoft.com/mssql-tools"
-      command = "/opt/mssql-tools/bin/sqlcmd -S $DB_HOST -U $DB_USERNAME -P $DB_PASSWORD -Q \"BACKUP DATABASE $DB_DATABASE_NAME TO DISK = '/backup/$DB_DATABASE_NAME-$(date +%Y%m%d).bak' WITH  COPY_ONLY, CHECKSUM,FORMAT, MEDIANAME = 'SQLServerBackups',NAME = 'Full Backup of SQLTestDB'\";exit"
-    }
-  }
-}
-
-variable "storage_path" {
-  type = map(string)
-  default = {
-    main_storage = "/data/kubernetes",
-    fast_access  = "/ssd"
-  }
-}
-
-
-
-locals {
-  env_details = flatten([
-    for key, value in var.kubernetes : [
-      for index, env in value.environment_variables : {
-        index = index
-        name  = env
-    }] if value.enabled == true && value.environment_variables != null
-  ])
-}
-
 
 
 resource "kubernetes_namespace_v1" "automatic" {

infrastructure/redis.tf

@@ -1,123 +1,4 @@
-resource "kubernetes_deployment_v1" "redis-automatic" {
+module "Redis-automatic" {
-  for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
+  source           = "../modules/redis"
-
+  kubernetes_input = var.kubernetes
-
-  metadata {
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-    name      = "${coalesce(each.value.name, each.key)}-redis"
-    labels = {
-      app               = each.key
-      deployment_method = "Terraform"
-      redis             = "true"
-    }
-  }
-
-  spec {
-    replicas = each.value.replicas
-
-    selector {
-      match_labels = {
-        app = "${each.key}-redis"
-      }
-    }
-
-    template {
-      metadata {
-        labels = {
-          app               = "${each.key}-redis"
-          deployment_method = "Terraform"
-          redis             = "true"
-        }
-      }
-
-      spec {
-        container {
-          image = try(each.value.redis.image, "docker.io/library/redis:7")
-          name  = "${coalesce(each.value.name, each.key)}-redis"
-          port {
-
-            container_port = 6379
-            name           = "redis-port"
-
-          }
-
-          volume_mount {
-            mount_path = "/data"
-            name       = "${each.key}-redis-volume"
-          }
-
-
-
-
-
-          dynamic "env" {
-            for_each = each.value.environment != null ? each.value.environment : {}
-            content {
-              name  = env.key
-              value = env.value.value != null ? env.value.value : null
-              dynamic "value_from" {
-                for_each = env.value.value_from != null ? env.value.value_from : {}
-                content {
-                  dynamic "secret_key_ref" {
-                    for_each = [1]
-                    content {
-                      name = env.value.value_from.secret_key_ref.name
-                      key  = env.value.value_from.secret_key_ref.key
-                      #                    optional = true
-                    }
-                  }
-                }
-              }
-
-            }
-          }
-
-
-          #          resources {
-          #            limits = {
-          #              cpu    = each.value.requirements.limits-cpu
-          #              memory = each.value.requirements.limits-memory
-          #            }
-          #            requests = {
-          #              cpu    = each.value.requirements.requests-cpu
-          #              memory = each.value.requirements.requests-memory
-          #            }
-          #          }
-
-          #          dynamic "liveness_probe" {
-          #            for_each = each.value.liveness_tcp_socket != null || each.value.liveness_http_get != null ? [""] : []
-          #           content {
-          #              dynamic "tcp_socket" {
-          #                for_each = each.value.liveness_tcp_socket != null ? [""] : []
-          #                content {
-          #                  port = each.value.liveness_tcp_socket
-          #                }
-          #              }
-
-
-          #              dynamic "http_get" {
-          #                for_each = each.value.liveness_http_get != null ? [""] : []
-          #                content {
-          #                  port = each.value.liveness_http_get
-          #                  path = coalesce(each.value.liveness_http_get_path, "/")
-          #                }
-          #              }
-
-          #              initial_delay_seconds = 3
-          #              period_seconds        = 3
-          #            }
-          #          }
-        }
-
-
-        volume {
-          name = "${each.key}-redis-volume"
-          host_path {
-            path = try(each.value.redis.host_path, join("/", [var.storage_path.main_storage, coalesce(each.value.namespace, each.value.connected_namespace, each.key), join("-", [each.key, "redis"])]))
-          }
-        }
-
-      }
-    }
-  }
 }

infrastructure/secrets.tf

@@ -1,198 +1,4 @@
-
+module "Secrets-automatic" {
-data "bitwarden-secrets_secret" "configmap_import" {
+  source           = "../modules/secrets"
-  for_each = {
+  kubernetes_input = var.kubernetes
-    for pair in flatten([
-      for k, v in var.kubernetes : [
-        for id in v.config_map_import : {
-          map_key   = k
-          secret_id = id
-        }
-      ] if v.config_map_import != null && v.enabled == true
-    ]) : "${pair.map_key}-${pair.secret_id}" => pair.secret_id
-  }
-  id = each.value
-}
-
-resource "kubernetes_config_map_v1" "configmap_import" {
-  for_each = { for key, value in data.bitwarden-secrets_secret.configmap_import : key => value }
-  metadata {
-    name      = each.value.note
-    namespace = split("__", each.value.key)[0]
-  }
-  data = yamldecode(each.value.value)
-}
-
-
-data "bitwarden-secrets_secret" "secret_import" {
-  for_each = {
-    for pair in flatten([
-      for k, v in var.kubernetes : [
-        for id in v.secret_import : {
-          map_key   = k
-          secret_id = id
-        }
-      ] if v.secret_import != null && v.enabled == true
-    ]) : "${pair.map_key}-${pair.secret_id}" => pair.secret_id
-  }
-  id = each.value
-}
-
-resource "kubernetes_secret_v1" "secret_import" {
-  for_each = { for key, value in data.bitwarden-secrets_secret.secret_import : key => value }
-  metadata {
-    name      = each.value.note
-    namespace = split("__", each.value.key)[0]
-  }
-  data = yamldecode(each.value.value)
-}
-
-
-resource "kubernetes_secret_v1" "automatic-database-secret" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  metadata {
-    name      = "${each.key}-db-terraform"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-  }
-
-  data = {
-    DB_DATABASE_NAME    = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    DB_DATABASE         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    POSTGRES_DB         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    MYSQL_DATABASE      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    PGDATABASE          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    DB_HOST             = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
-    PGHOST              = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
-    POSTGRES_HOST       = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
-    DB_PASSWORD         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    MYSQL_PASSWORD      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    MYSQL_ROOT_PASSWORD = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    POSTGRES_PASSWORD   = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    PGPASSWORD          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    DB_USERNAME         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-    POSTGRES_USER       = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-    MYSQL_USER          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-    PGUSER              = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-    DATABASE_URL        = "postgresql://${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}:${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}@${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}:${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_port[each.key].value}/${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-  }
-
-}
-
-resource "kubernetes_secret_v1" "automatic-database-mapped-secret" {
-  for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  metadata {
-    name      = "${each.key}-db-mapped-terraform"
-    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
-  }
-
-  data = {
-    "${try(each.value.database.map_name, "DB_DATABASE_NAME")}"     = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
-    "${try(each.value.database.map_host, "DB_DATABASE_NAME")}"     = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
-    "${try(each.value.database.map_password, "DB_DATABASE_NAME")}" = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
-    "${try(each.value.database.map_username, "DB_DATABASE_NAME")}" = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
-  }
-}
-
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_username" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key        = "${each.key}__db__username"
-  value      = try(each.value.database.username, each.key)
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  lifecycle {
-    ignore_changes = [
-      value, key
-    ]
-  }
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_password" {
-  for_each        = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key             = "${each.key}__db__password"
-  project_id      = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  length          = 32
-  special         = true
-  min_special     = 5
-  avoid_ambiguous = true
-  lifecycle {
-    ignore_changes = [
-      value, key
-    ]
-  }
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_host" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key        = "${each.key}__db__host"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.database.host, "${each.key}-db-svc.${coalesce(each.value.namespace, each.value.connected_namespace, each.key)}.svc")
-  lifecycle {
-    ignore_changes = [
-      value, key
-    ]
-  }
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_port" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key        = "${each.key}__db__port"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.database.port, 5432)
-  lifecycle {
-    ignore_changes = [
-      value, key
-    ]
-  }
-}
-
-resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_name" {
-  for_each   = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
-  key        = "${each.key}__db__name"
-  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
-  value      = try(each.value.database.name, each.key)
-  lifecycle {
-    ignore_changes = [
-      value, key
-    ]
-  }
-}
-
-# 1. Move the loop logic to a local variable first
-locals {
-  database_secrets_to_import = {
-    for key, value in var.kubernetes : key => value
-    if value.database != null && value.enabled == true && try(value.import_database_secret, "") != ""
-  }
-}
-
-# 2. Reference the local map in your import block using each.key and each.value
-import {
-  for_each = local.database_secrets_to_import
-
-  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key]
-  id = each.value.import_database_secret.host
-}
-
-import {
-  for_each = local.database_secrets_to_import
-
-  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key]
-  id = each.value.import_database_secret.name
-}
-import {
-  for_each = local.database_secrets_to_import
-
-  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key]
-  id = each.value.import_database_secret.password
-}
-import {
-  for_each = local.database_secrets_to_import
-
-  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_port[each.key]
-  id = each.value.import_database_secret.port
-}
-import {
-  for_each = local.database_secrets_to_import
-
-  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key]
-  id = each.value.import_database_secret.username
 }

infrastructure/variables.auto.tfvars

@@ -2,20 +2,14 @@ kubernetes = {
 
   gluetun = {
     #enabled         = false
-    dns_nameservers = "1.1.1.1"
+    dns_nameservers  = "1.1.1.1"
-    replicas        = 01
+    replicas         = 01
-    image           = "qmcgaw/gluetun:latest"
+    image            = "qmcgaw/gluetun:latest"
-    exposed         = false
+    exposed          = false
-    service_port    = [8888]
+    service_port     = [8888]
-    #extra_manifest    = ["/opt/kubernetes/Terraform_kube/external_manifests/gluetun/gluetun-secret-netherlandNL-FREE-280.yaml"]
     secret_import    = ["5527ba11-07e3-415b-8d1f-b3ee0154eb56", "b0d22160-d81a-4702-a3dd-b40e0168d617", "643dbe99-ace0-4ef5-8a2e-b44f014dccb0"]
     security_context = true
-    #    requirements = {
+
-    #      limits-cpu      = "800Mi"
-    #      limits-memory   = "800Mi"
-    #      requests-cpu    = "800Mi"
-    #      requests-memory = "800Mi"
-    #    }
     environment = {
       WIREGUARD_PRIVATE_KEY = {
         value_from = {
@@ -34,9 +28,6 @@ kubernetes = {
       HTTPPROXY_LISTENING_ADDRESS = {
         value = "0.0.0.0:8888"
       }
-      #      DNS_KEEP_NAMESERVER = {
-      #        value = "on"
-      #      }
       VPN_SERVICE_PROVIDER = {
         value = "protonvpn"
       }
@@ -54,9 +45,6 @@ kubernetes = {
         value = "on"
       }
 
-      #      WIREGUARD_ADDRESSES = {
-      #        value = "10.2.0.2/32"
-      #      }
       FIREWALL_INPUT_PORTS = {
         value = "8081,7878,9696,9091,51413,8080,6881,8989,8191,8888,8000"
       }
@@ -64,28 +52,22 @@ kubernetes = {
         value = "ip2location"
       }
 
-      #      HEALTH_TARGET_ADDRESS = {
-      #        value = "protonvpn.com:80"
-      #      }
-      #      FIREWALL_OUTBOUND_SUBNETS = {
-      #      value = "10.0.0.0/24" }
-
     }
 
   }
 
 
   django = {
-    enabled      = false
+    #enabled      = false
     namespace    = "django"
-    image        = "gitea.tryton.geeraert.eu/pi-ux-ce/django-python:latest"
+    domain_name  = ["django", "admin", "redirect", "streaming", "stash", "simpsons", "kubernetes", "cloudmanager", "podcast"]
+    image        = "gitea.geeraert.eu/pi-ux-ce/django-python:latest"
     service_port = [8000]
     database = {
       image     = "docker.io/tensorchord/pgvecto-rs:pg14-v0.2.0"
       username  = "django_username"
       mountPath = "/var/lib/postgresql/data"
     }
-    #redis         = {}
     secret_ref    = ["django-bitwarden-credentials"]
     secret_import = ["9fc5a725-75f5-4bab-b595-b474017146c3"]
     requirements = {
@@ -106,11 +88,6 @@ kubernetes = {
       ENVIRONMENT = {
         value = "PRODUCTION"
       }
-      #CELERY_BROKER_URL = {
-      #  value = "redis://django-redis-svc:6379"
-      #}
-      #HTTP_PROXY = {
-      #value = "http://gluetun-svc.gluetun.svc:8888" }
 
       DB_PASSWORD = {
         value_from = {
@@ -158,16 +135,13 @@ kubernetes = {
 
     }
     pvc = {
-      kubeconfig-secret = {
+      kubeconfig = {
         secret     = true
-        name       = "kubeconfig"
         mount_path = "/kubeconfig"
       }
 
       stash-django-pvc = {
         host_path  = "/ssd/stash/data-pvc/"
-        name       = "stash-django-pvc"
-        pvc_size   = "2Mi"
         mount_path = "/stash"
       }
     }
@@ -175,10 +149,10 @@ kubernetes = {
 
   django-testing = {
     #enabled      = false
-    image        = "gitea.tryton.geeraert.eu/pi-ux-ce/django-testing:latest"
+    image        = "gitea.geeraert.eu/pi-ux-ce/django-testing:latest"
     service_port = [8000]
+    domain_name  = ["django-testing", "admin-testing", "redirect-testing", "streaming-testing", "stash-testing", "simpsons-testing", "kubernetes-testing", "cloudmanager-testing", "podcast-testing"]
     database     = {}
-    #redis        = {}
     requirements = {
       limits-cpu      = "800m"
       limits-memory   = "800Mi"
@@ -211,16 +185,6 @@ kubernetes = {
         mount_path = "/kubeconfig"
       }
     }
-
-    import_database_secret = {
-      host     = "097f10de-63ee-405c-b46a-b41001781e07"
-      name     = "20530a85-e446-4d79-8985-b41001781e07"
-      password = "a3385f49-ba92-4478-b6f1-b4e100ff01fb"
-      port     = "e15e00eb-db1e-47ea-ab0e-b41001781e09"
-      username = "3c67d310-7113-45b7-8f3f-b41001781e08"
-
-    }
-
   }
 
 

modules/database/main.tf

@@ -0,0 +1,224 @@
+variable "kubernetes_input" {
+  type = map(object({
+    name   = optional(string)
+    environment = optional(map(object({
+      name  = optional(string)
+      value = optional(string)
+      value_from = optional(object({
+        secret_key_ref = object({
+          name = string
+          key  = optional(string, null)
+        })
+      }))
+    })))
+    replicas               = optional(number, 1)
+    namespace              = optional(string)
+    connected_namespace    = optional(string, "")
+     database               = optional(map(string))
+    database_args          = optional(list(string))
+    enabled                = optional(bool, true)
+  }))
+
+}
+
+variable "database_backup_info" {
+  type = map(object({
+    image   = optional(string)
+    command = optional(string)
+  }))
+  description = "based on DB engine, give the docker image and the command used to backup"
+  default = {
+    postgres = {
+      image   = "alpine/psql"
+      command = "pg_dump |gzip -9 > /backup/$(DB_DATABASE_NAME)-DB-$(date +%Y%m%d).sql.gz"
+    }
+    mysql = {
+      image   = "mysql"
+      command = "mysqldump -h $DB_HOST -u $MYSQL_USER -p$MYSQL_ROOT_PASSWORD $MYSQL_DATABASE |gzip -9 > /backup/$(DB_DATABASE_NAME)-DB-$(date +%Y%m%d).sql.gz"
+    }
+    sqlserver = {
+      image   = "mcr.microsoft.com/mssql-tools"
+      command = "/opt/mssql-tools/bin/sqlcmd -S $DB_HOST -U $DB_USERNAME -P $DB_PASSWORD -Q \"BACKUP DATABASE $DB_DATABASE_NAME TO DISK = '/backup/$DB_DATABASE_NAME-$(date +%Y%m%d).bak' WITH  COPY_ONLY, CHECKSUM,FORMAT, MEDIANAME = 'SQLServerBackups',NAME = 'Full Backup of SQLTestDB'\";exit"
+    }
+  }
+}
+
+variable "storage_path" {
+  type = map(string)
+  default = {
+    main_storage = "/data/kubernetes",
+    fast_access  = "/ssd"
+  }
+}
+
+resource "kubernetes_deployment_v1" "database-automatic" {
+  for_each = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true && !(try(value.database.shunt, false)) }
+
+
+  metadata {
+    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
+    name      = "${coalesce(each.value.name, each.key)}-db"
+    labels = {
+      app               = each.key
+      deployment_method = "Terraform"
+      database          = "true"
+    }
+  }
+
+  spec {
+    replicas = each.value.replicas
+
+    selector {
+      match_labels = {
+        app = "${each.key}-db"
+      }
+    }
+
+    template {
+      metadata {
+        labels = {
+          app               = "${each.key}-db"
+          deployment_method = "Terraform"
+          database          = "true"
+        }
+      }
+
+      spec {
+        container {
+          image = try(each.value.database.image, "docker.io/library/postgres:latest")
+          name  = "${coalesce(each.value.name, each.key)}-db"
+          port {
+
+            container_port = 5432
+            name           = "database-port"
+
+          }
+
+          volume_mount {
+            mount_path = try(each.value.database.mountPath, "/var/lib/postgresql/")
+            name       = "${each.key}-db-volume"
+          }
+
+          dynamic "volume_mount" {
+            for_each = try(each.value.database.engine == "sqlserver", false) && !(try(each.value.database.shunt, false)) ? [1] : []
+            content {
+              mount_path = "/backup"
+              name       = "${each.key}-db-backup"
+            }
+          }
+
+          command = try([each.value.database.command], [])
+          args    = each.value.database_args != null ? each.value.database_args : []
+
+          dynamic "env_from" {
+            for_each = each.value.database != null && each.value.enabled == true && !(try(each.value.database.shunt, false)) ? ["${each.key}-db-terraform"] : []
+            content {
+              dynamic "secret_ref" {
+                for_each = [1]
+                content {
+                  name = env_from.value
+                }
+              }
+            }
+          }
+
+          dynamic "env" {
+            for_each = each.value.environment != null ? each.value.environment : {}
+            content {
+              name  = env.key
+              value = env.value.value != null ? env.value.value : null
+              dynamic "value_from" {
+                for_each = env.value.value_from != null ? env.value.value_from : {}
+                content {
+                  dynamic "secret_key_ref" {
+                    for_each = [1]
+                    content {
+                      name = env.value.value_from.secret_key_ref.name
+                      key  = env.value.value_from.secret_key_ref.key
+                    }
+                  }
+                }
+              }
+
+            }
+          }
+
+
+        }
+
+
+        volume {
+          name = "${each.key}-db-volume"
+          host_path {
+            path = try(each.value.database.host_path, join("/", [var.storage_path.main_storage, coalesce(each.value.namespace, each.value.connected_namespace, each.key), join("-", [each.key, "db"])]))
+          }
+        }
+
+        dynamic "volume" {
+          for_each = try(each.value.database.engine == "sqlserver", false) && !(try(each.value.database.shunt, false)) ? [1] : []
+          content {
+            name = "${each.key}-db-backup"
+
+            host_path {
+              path = join("/", [var.storage_path.fast_access, "Backup", coalesce(each.value.namespace, each.value.connected_namespace, each.key), "${each.key}-db-backup"])
+            }
+          }
+        }
+
+      }
+    }
+  }
+}
+
+
+resource "kubernetes_cron_job_v1" "database-backup" {
+  for_each = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true }
+  metadata {
+    name      = "${coalesce(each.value.namespace, each.key)}-db-backup"
+    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
+    labels = {
+      app               = each.key
+      deployment_method = "Terraform"
+      database          = "true"
+    }
+  }
+  spec {
+    failed_jobs_history_limit     = 5
+    schedule                      = "1 0 * * *"
+    timezone                      = "Etc/UTC"
+    successful_jobs_history_limit = 5
+    job_template {
+      metadata {}
+      spec {
+        backoff_limit              = 4
+        ttl_seconds_after_finished = 100
+        template {
+          metadata {}
+          spec {
+            container {
+              name    = "${coalesce(each.value.namespace, each.key)}-db-backup"
+              image   = try(var.database_backup_info[each.value.database.engine].image, var.database_backup_info.postgres.image)
+              command = ["/bin/sh", "-c"]
+              args    = [try(var.database_backup_info[each.value.database.engine].command, var.database_backup_info.postgres.command)]
+              env_from {
+                secret_ref {
+                  name = "${each.key}-db-terraform"
+                }
+              }
+              volume_mount {
+                mount_path = "/backup"
+                name       = "${each.key}-db-backup"
+              }
+            }
+            volume {
+              name = "${each.key}-db-backup"
+              host_path {
+                path = join("/", [var.storage_path.fast_access, "Backup", coalesce(each.value.namespace, each.value.connected_namespace, each.key), "${each.key}-db-backup"])
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}

modules/deployment/main.tf

@@ -0,0 +1,287 @@
+variable "kubernetes_input" {
+  type = map(object({
+    name   = optional(string)
+    image  = string
+     pvc = optional(map(object({
+       name                 = optional(string)
+       pvc                  = optional(bool, false)
+       config_map           = optional(bool, false)
+       secret               = optional(bool, false)
+       host_path            = optional(string)
+       pvc_size             = optional(string)
+       storage_class_name   = optional(string, "nfs-storage-intelligent")
+       annotations_fileType = optional(string)
+       existing_pvc         = optional(bool, false)
+       mount_path           = string
+       sub_path             = optional(string)
+     })))
+     environment = optional(map(object({
+       name  = optional(string)
+       value = optional(string)
+       value_from = optional(object({
+         secret_key_ref = object({
+           name = string
+           key  = optional(string, null)
+         })
+       }))
+     })))
+    replicas               = optional(number, 1)
+    namespace              = optional(string)
+    connected_namespace    = optional(string, "")
+    command                = optional(list(string))
+    service_port           = optional(list(number))
+    liveness_tcp_socket    = optional(number)
+    liveness_http_get      = optional(string)
+    liveness_http_get_path = optional(string)
+    database               = optional(map(string))
+    enabled                = optional(bool, true)
+    secret_ref             = optional(list(string))
+    config_map_ref         = optional(list(string))
+    requirements           = optional(map(string))
+    dns_nameservers       = optional(string)
+    service_account_name  = optional(string)
+    security_context      = optional(bool, false)
+
+  }))
+
+}
+
+variable "storage_path" {
+  type = map(string)
+  default = {
+    main_storage = "/data/kubernetes",
+    fast_access  = "/ssd"
+  }
+}
+
+resource "kubernetes_deployment_v1" "automatic" {
+  for_each = { for key, value in var.kubernetes_input : key => value if value.enabled == true }
+  metadata {
+    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
+    name      = coalesce(each.value.name, each.key)
+
+    labels = {
+      app               = each.key
+      deployment_method = "Terraform"
+    }
+  }
+
+  spec {
+    replicas = each.value.replicas
+
+    selector {
+      match_labels = {
+        app = each.key
+      }
+    }
+
+    template {
+      metadata {
+        labels = {
+          app               = each.key
+          deployment_method = "Terraform"
+        }
+      }
+
+      spec {
+        container {
+          image = each.value.image
+          name  = coalesce(each.value.name, each.key)
+          dynamic "port" {
+            for_each = each.value.service_port != null ? each.value.service_port : []
+            content {
+              container_port = port.value
+              #              name           = "${each.key}-${port.value}"
+              name = replace("${port.value}${each.key}", "/(.{0,15})(.*)/", "$1")
+            }
+          }
+
+
+          dynamic "volume_mount" {
+            for_each = each.value.pvc != null ? each.value.pvc : {}
+            content {
+              mount_path = volume_mount.value.mount_path
+              name       = "${volume_mount.key}-volume"
+              sub_path   = volume_mount.value.sub_path != null ? volume_mount.value.sub_path : ""
+            }
+          }
+
+          dynamic "volume_mount" {
+            for_each = try(each.value.database.engine == "sqlserver", false) && try(each.value.database.shunt, false) ? [1] : []
+            content {
+              mount_path = "/backup"
+              name       = "${each.key}-db-backup"
+            }
+          }
+
+          dynamic "env_from" {
+            for_each = each.value.secret_ref != null ? each.value.secret_ref : []
+            content {
+              dynamic "secret_ref" {
+                for_each = [1]
+                content {
+                  name = env_from.value
+                }
+              }
+
+            }
+          }
+          dynamic "env_from" {
+            for_each = each.value.database != null && each.value.enabled == true && !(try(each.value.database.shunt, false)) ? ["${each.key}-db-terraform"] : []
+            #for_each = each.value.database != null && each.value.enabled == true  ? ["${each.key}-db-terraform"] : []
+            content {
+              dynamic "secret_ref" {
+                for_each = [1]
+                content {
+                  name = env_from.value
+                }
+              }
+            }
+          }
+          dynamic "env_from" {
+            for_each = each.value.database != null && each.value.enabled == true ? ["${each.key}-db-mapped-terraform"] : []
+            content {
+              dynamic "secret_ref" {
+                for_each = [1]
+                content {
+                  name = env_from.value
+                }
+              }
+            }
+          }
+          dynamic "env_from" {
+            for_each = each.value.config_map_ref != null ? each.value.config_map_ref : []
+            content {
+              dynamic "config_map_ref" {
+                for_each = [1]
+                content {
+                  name = env_from.value
+                }
+              }
+            }
+          }
+
+          command = each.value.command != null ? each.value.command : []
+
+
+          dynamic "env" {
+            for_each = each.value.environment != null ? each.value.environment : {}
+            content {
+              name  = env.key
+              value = env.value.value != null ? env.value.value : null
+              dynamic "value_from" {
+                for_each = env.value.value_from != null ? env.value.value_from : {}
+                content {
+                  dynamic "secret_key_ref" {
+                    for_each = [1]
+                    content {
+                      name = env.value.value_from.secret_key_ref.name
+                      key  = env.value.value_from.secret_key_ref.key
+                    }
+                  }
+                }
+              }
+
+            }
+          }
+          dynamic "resources" {
+            for_each = each.value.requirements != null ? [1] : []
+            content {
+              limits = {
+                cpu    = each.value.requirements.limits-cpu
+                memory = each.value.requirements.limits-memory
+              }
+              requests = {
+                cpu    = each.value.requirements.requests-cpu
+                memory = each.value.requirements.requests-memory
+              }
+
+            }
+          }
+
+
+          dynamic "security_context" {
+            for_each = each.value.security_context == true ? [1] : []
+            content {
+              privileged = true
+              #capabilities = {
+              #  add : ["NET_ADMIN", "NET_RAW"]
+              #}
+            }
+          }
+          dynamic "liveness_probe" {
+            for_each = each.value.liveness_tcp_socket != null || each.value.liveness_http_get != null ? [""] : []
+            content {
+              dynamic "tcp_socket" {
+                for_each = each.value.liveness_tcp_socket != null ? [""] : []
+                content {
+                  port = each.value.liveness_tcp_socket
+                }
+              }
+
+              dynamic "http_get" {
+                for_each = each.value.liveness_http_get != null ? [""] : []
+                content {
+                  port = each.value.liveness_http_get
+                  path = coalesce(each.value.liveness_http_get_path, "/")
+                }
+              }
+
+              initial_delay_seconds = 3
+              period_seconds        = 3
+            }
+          }
+        }
+        dynamic "dns_config" {
+          for_each = each.value.dns_nameservers != null ? [1] : []
+          content {
+            nameservers = [each.value.dns_nameservers]
+          }
+
+        }
+        service_account_name = each.value.service_account_name != null ? each.value.service_account_name : null
+
+        dynamic "volume" {
+          for_each = each.value.pvc != null ? each.value.pvc : {}
+          content {
+            name = "${volume.key}-volume"
+
+            dynamic "config_map" {
+              for_each = volume.value.config_map ? [1] : []
+              content {
+                name = volume.key
+              }
+            }
+
+            dynamic "host_path" {
+              for_each = volume.value.host_path != null || (!(volume.value.config_map) && !(volume.value.secret)) ? [1] : []
+              content {
+                path = coalesce(volume.value.host_path, join("/", [var.storage_path.main_storage, coalesce(each.value.namespace, each.value.connected_namespace, each.key), volume.key]))
+
+              }
+            }
+
+            dynamic "secret" {
+              for_each = volume.value.secret ? [1] : []
+              content {
+                secret_name = volume.key
+              }
+            }
+
+          }
+        }
+        dynamic "volume" {
+          for_each = try(each.value.database.engine == "sqlserver", false) && try(each.value.database.shunt, false) ? [1] : []
+          content {
+            name = "${each.key}-db-backup"
+
+            host_path {
+              path = join("/", [var.storage_path.fast_access, "Backup", coalesce(each.value.namespace, each.value.connected_namespace, each.key), "${each.key}-db-backup"])
+            }
+          }
+        }
+
+      }
+    }
+  }
+}

modules/ingress/ingress.tf

@@ -2,57 +2,14 @@ variable "kubernetes_input" {
   type = map(object({
     name   = optional(string)
     docker = optional(bool)
-    image  = string
-    pvc = optional(map(object({
-      name                 = optional(string)
-      config_map           = optional(bool, false)
-      secret               = optional(bool, false)
-      local_path           = optional(bool, false)
-      host_path            = optional(string)
-      storage_class_name   = optional(string, "nfs-storage-intelligent")
-      annotations_fileType = optional(string)
-      mount_path           = string
-      sub_path             = optional(string)
-    })))
-    environment = optional(map(object({
-      name  = optional(string)
-      value = optional(string)
-      value_from = optional(object({
-        secret_key_ref = object({
-          name = string
-          key  = optional(string, null)
-        })
-      }))
-    })))
-    replicas               = optional(number, 1)
     namespace              = optional(string)
     connected_namespace    = optional(string, "")
-    command                = optional(list(string))
     service_port           = optional(list(number))
-    external_port          = optional(bool, false)
     service_type           = optional(string, "ClusterIP")
-    service_name           = optional(string)
     domain_name            = optional(list(string))
     legacy_domain          = optional(bool, false)
     exposed                = optional(bool, true)
-    liveness_tcp_socket    = optional(number)
-    liveness_http_get      = optional(string)
-    liveness_http_get_path = optional(string)
-    database               = optional(map(string))
-    database_command       = optional(list(string))
-    database_args          = optional(list(string))
-    redis                  = optional(map(string))
     enabled                = optional(bool, true)
-    secret_ref             = optional(list(string))
-    config_map_ref         = optional(list(string))
-    config_map_import      = optional(list(string))
-    secret_import          = optional(list(string))
-    extra_manifest         = optional(list(string))
-    requirements           = optional(map(string))
-    dns_nameservers        = optional(string)
-    service_account_name   = optional(string)
-    environment_variables  = optional(map(string), { name = "value" })
-    security_context       = optional(bool, false)
   }))
 
 }
@@ -111,11 +68,10 @@ resource "kubernetes_ingress_v1" "automatic_ingress" {
 }
 
 resource "kubernetes_ingress_v1" "automatic_ingress_legacy" {
-  # Keep your top-level filter for filtering active services
+  for_each = { for key, value in var.kubernetes_input : key => value if value.service_port != null && value.enabled == true && value.docker != true && value.exposed == true && value.legacy_domain == true }
-  for_each = { for key, value in var.kubernetes_input : key => value if value.service_port != null && value.enabled == true && value.docker != true && value.exposed == true }
 
   metadata {
-    name      = "${each.key}-ingress"
+    name      = "${each.key}-legacy-ingress"
     namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
 
     annotations = {
@@ -132,8 +88,8 @@ resource "kubernetes_ingress_v1" "automatic_ingress_legacy" {
     dynamic "tls" {
       for_each = toset(coalesce(each.value.domain_name, [each.key]))
       content {
-        hosts       = [join(".", [tls.value, "geeraert.eu"])]
+        hosts       = [join(".", [tls.value, "tryton.geeraert.eu"])]
-        secret_name = "${each.key}-${tls.value}-tls-secret"
+        secret_name = "${each.key}-${tls.value}-tryton-tls-secret"
       }
     }
 
@@ -142,7 +98,7 @@ resource "kubernetes_ingress_v1" "automatic_ingress_legacy" {
     dynamic "rule" {
       for_each = toset(coalesce(each.value.domain_name, [each.key]))
       content {
-        host = join(".", [rule.value, "geeraert.eu"])
+        host = join(".", [rule.value, "tryton.geeraert.eu"])
         http {
           path {
             path = "/"

modules/redis/main.tf

@@ -0,0 +1,109 @@
+variable "kubernetes_input" {
+  type = map(object({
+    name   = optional(string)
+    environment = optional(map(object({
+      name  = optional(string)
+      value = optional(string)
+      value_from = optional(object({
+        secret_key_ref = object({
+          name = string
+          key  = optional(string, null)
+        })
+      }))
+    })))
+    replicas               = optional(number, 1)
+    namespace              = optional(string)
+    connected_namespace    = optional(string, "")
+    redis                  = optional(map(string))
+    enabled                = optional(bool, true)
+  }))
+
+}
+variable "storage_path" {
+  type = map(string)
+  default = {
+    main_storage = "/data/kubernetes",
+    fast_access  = "/ssd"
+  }
+}
+
+resource "kubernetes_deployment_v1" "redis-automatic" {
+  for_each = {for key, value in var.kubernetes_input : key => value if value.redis != null && value.enabled == true}
+
+
+  metadata {
+    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
+    name = "${coalesce(each.value.name, each.key)}-redis"
+    labels = {
+      app               = each.key
+      deployment_method = "Terraform"
+      redis             = "true"
+    }
+  }
+
+  spec {
+    replicas = each.value.replicas
+
+    selector {
+      match_labels = {
+        app = "${each.key}-redis"
+      }
+    }
+
+    template {
+      metadata {
+        labels = {
+          app               = "${each.key}-redis"
+          deployment_method = "Terraform"
+          redis             = "true"
+        }
+      }
+
+      spec {
+        container {
+          image = try(each.value.redis.image, "docker.io/library/redis:7")
+          name = "${coalesce(each.value.name, each.key)}-redis"
+          port {
+
+            container_port = 6379
+            name           = "redis-port"
+
+          }
+
+          volume_mount {
+            mount_path = "/data"
+            name       = "${each.key}-redis-volume"
+          }
+
+
+          dynamic "env" {
+            for_each = each.value.environment != null ? each.value.environment : {}
+            content {
+              name  = env.key
+              value = env.value.value != null ? env.value.value : null
+              dynamic "value_from" {
+                for_each = env.value.value_from != null ? env.value.value_from : {}
+                content {
+                  dynamic "secret_key_ref" {
+                    for_each = [1]
+                    content {
+                      name = env.value.value_from.secret_key_ref.name
+                      key  = env.value.value_from.secret_key_ref.key
+                    }
+                  }
+                }
+              }
+            }
+          }
+
+        }
+          volume {
+            name = "${each.key}-redis-volume"
+            host_path {
+              path = try(each.value.redis.host_path, join("/", [var.storage_path.main_storage, coalesce(each.value.namespace, each.value.connected_namespace, each.key), join("-", [each.key, "redis"])]))
+            }
+          }
+      }
+    }
+  }
+} 

modules/secrets/main.tf

@@ -0,0 +1,321 @@
+terraform {
+  required_version = "> 0.8.0"
+  required_providers {
+    bitwarden-secrets = {
+      source  = "bitwarden/bitwarden-secrets"
+      version = "0.5.4-pre"
+    }
+  }
+
+}
+provider "bitwarden-secrets" {
+  api_url         = "https://bitwarden.geeraert.eu/api"
+  identity_url    = "https://bitwarden.geeraert.eu/identity"
+  access_token    = "0.9f4b7c5f-e6e7-4eff-929e-b474016a2b9c.bMRELajGGb7qMuXXvzgCCJdDfxfTCS:mFDT7tHSi43KJSnkwvTSYg=="
+  organization_id = "a6361589-badd-4bde-9cb4-af8901161c0d"
+}
+
+variable "kubernetes_input" {
+  type = map(object({
+    namespace              = optional(string)
+    connected_namespace    = optional(string, "")
+    database               = optional(map(string))
+    redis                  = optional(map(string))
+    enabled                = optional(bool, true)
+    config_map_import      = optional(list(string))
+    secret_import          = optional(list(string))
+       requirements = optional(map(string), {
+         limits-cpu      = "800m"
+         limits-memory   = "500Mi"
+         requests-cpu    = "200m"
+         requests-memory = "200Mi"
+       })
+    import_database_secret = optional(object({
+      #putting them a non optional as the code doesn't allow optional value 
+      host     = string
+      name     = string
+      password = string
+      port     = string
+      username = string
+    }))
+  }))
+
+}
+
+###########################################################################################################################################################################################
+#
+#
+#                                                                       CONFIGMAP PART
+#
+#
+#
+###########################################################################################################################################################################################
+data "bitwarden-secrets_secret" "configmap_import" {
+  for_each = {
+    for pair in flatten([
+      for k, v in var.kubernetes_input : [
+        for id in v.config_map_import : {
+          map_key   = k
+          secret_id = id
+        }
+      ] if v.config_map_import != null && v.enabled == true
+    ]) : "${pair.map_key}-${pair.secret_id}" => pair.secret_id
+  }
+  id = each.value
+}
+
+resource "kubernetes_config_map_v1" "configmap_import" {
+  for_each = { for key, value in data.bitwarden-secrets_secret.configmap_import : key => value }
+  metadata {
+    name      = each.value.note
+    namespace = split("__", each.value.key)[0]
+  }
+  data = yamldecode(each.value.value)
+}
+
+
+data "bitwarden-secrets_secret" "secret_import" {
+  for_each = {
+    for pair in flatten([
+      for k, v in var.kubernetes_input : [
+        for id in v.secret_import : {
+          map_key   = k
+          secret_id = id
+        }
+      ] if v.secret_import != null && v.enabled == true
+    ]) : "${pair.map_key}-${pair.secret_id}" => pair.secret_id
+  }
+  id = each.value
+}
+
+resource "kubernetes_secret_v1" "secret_import" {
+  for_each = { for key, value in data.bitwarden-secrets_secret.secret_import : key => value }
+  metadata {
+    name      = each.value.note
+    namespace = split("__", each.value.key)[0]
+  }
+  data = yamldecode(each.value.value)
+}
+
+###########################################################################################################################################################################################
+#
+#
+#                                                                       DATABASE PART
+#
+#
+#
+###########################################################################################################################################################################################
+resource "kubernetes_secret_v1" "automatic-database-secret" {
+  for_each = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true }
+  metadata {
+    name      = "${each.key}-db-terraform"
+    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
+  }
+
+  data = {
+    DB_DATABASE_NAME    = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
+    DB_DATABASE         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
+    POSTGRES_DB         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
+    MYSQL_DATABASE      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
+    PGDATABASE          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
+    DB_HOST             = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
+    PGHOST              = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
+    POSTGRES_HOST       = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
+    DB_PASSWORD         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
+    MYSQL_PASSWORD      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
+    MYSQL_ROOT_PASSWORD = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
+    POSTGRES_PASSWORD   = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
+    PGPASSWORD          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
+    DB_USERNAME         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
+    POSTGRES_USER       = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
+    MYSQL_USER          = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
+    PGUSER              = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
+    DATABASE_URL        = "postgresql://${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}:${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}@${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}:${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_port[each.key].value}/${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
+  }
+
+}
+
+resource "kubernetes_secret_v1" "automatic-database-mapped-secret" {
+  for_each = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true }
+  metadata {
+    name      = "${each.key}-db-mapped-terraform"
+    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
+  }
+
+  data = {
+    "${try(each.value.database.map_name, "DB_DATABASE_NAME")}"     = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key].value}"
+    "${try(each.value.database.map_host, "DB_DATABASE_NAME")}"     = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key].value}"
+    "${try(each.value.database.map_password, "DB_DATABASE_NAME")}" = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key].value}"
+    "${try(each.value.database.map_username, "DB_DATABASE_NAME")}" = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key].value}"
+  }
+}
+
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_username" {
+  for_each   = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true }
+  key        = "${each.key}__db__username"
+  value      = try(each.value.database.username, each.key)
+  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  lifecycle {
+    ignore_changes = [
+      value, key
+    ]
+  }
+}
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_password" {
+  for_each        = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true }
+  key             = "${each.key}__db__password"
+  project_id      = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  length          = 32
+  special         = true
+  min_special     = 5
+  avoid_ambiguous = true
+  lifecycle {
+    ignore_changes = [
+      value, key
+    ]
+  }
+}
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_host" {
+  for_each   = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true }
+  key        = "${each.key}__db__host"
+  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  value      = try(each.value.database.host, "${each.key}-db-svc.${coalesce(each.value.namespace, each.value.connected_namespace, each.key)}.svc")
+  lifecycle {
+    ignore_changes = [
+      value, key
+    ]
+  }
+}
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_port" {
+  for_each   = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true }
+  key        = "${each.key}__db__port"
+  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  value      = try(each.value.database.port, 5432)
+  lifecycle {
+    ignore_changes = [
+      value, key
+    ]
+  }
+}
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_db_name" {
+  for_each   = { for key, value in var.kubernetes_input : key => value if value.database != null && value.enabled == true }
+  key        = "${each.key}__db__name"
+  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  value      = try(each.value.database.name, each.key)
+  lifecycle {
+    ignore_changes = [
+      value, key
+    ]
+  }
+}
+
+# 1. Move the loop logic to a local variable first
+locals {
+  database_secrets_to_import = {
+    for key, value in var.kubernetes_input : key => value
+    if value.database != null && value.enabled == true && can(value.import_database_secret.host)
+  }
+}
+
+# 2. Reference the local map in your import block using each.key and each.value
+import {
+  for_each = local.database_secrets_to_import
+
+  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_host[each.key]
+  id = each.value.import_database_secret.host
+}
+
+import {
+  for_each = local.database_secrets_to_import
+
+  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_name[each.key]
+  id = each.value.import_database_secret.name
+}
+import {
+  for_each = local.database_secrets_to_import
+
+  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_password[each.key]
+  id = each.value.import_database_secret.password
+}
+import {
+  for_each = local.database_secrets_to_import
+
+  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_port[each.key]
+  id = each.value.import_database_secret.port
+}
+import {
+  for_each = local.database_secrets_to_import
+
+  to = bitwarden-secrets_secret.automatic_bitwarden_secret_db_username[each.key]
+  id = each.value.import_database_secret.username
+}
+###########################################################################################################################################################################################
+#
+#
+#                                                                       REDIS PART
+#
+#
+#
+###########################################################################################################################################################################################
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_host" {
+  for_each   = { for key, value in var.kubernetes_input : key => value if value.redis != null && value.enabled == true }
+  key        = "${each.key}__redis__host"
+  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  value      = try(each.value.redis.host, "${each.key}-redis-svc.${coalesce(each.value.namespace, each.value.connected_namespace, each.key)}.svc")
+}
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_port" {
+  for_each   = { for key, value in var.kubernetes_input : key => value if value.redis != null && value.enabled == true }
+  key        = "${each.key}__redis__port"
+  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  value      = try(each.value.redis.port, 5432)
+}
+
+##
+## Commenting until I use the redis password option
+##
+#resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_password" {
+#  for_each        = { for key, value in var.kubernetes_input : key => value if value.redis != null && value.enabled == true }
+#  key             = "${each.key}__redis__password"
+#  project_id      = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+#  length          = 32
+#  special         = true
+#  min_special     = 5
+#  avoid_ambiguous = true
+#}
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_REPLICATION_MODE" {
+  for_each   = { for key, value in var.kubernetes_input : key => value if value.redis != null && value.enabled == true }
+  key        = "${each.key}__redis__REPLICATION_MODE"
+  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  value      = try(each.value.redis.REPLICATION_MODE, "master")
+}
+
+resource "bitwarden-secrets_secret" "automatic_bitwarden_secret_redis_TLS_ENABLED" {
+  for_each   = { for key, value in var.kubernetes_input : key => value if value.redis != null && value.enabled == true }
+  key        = "${each.key}__redis__TLS_ENABLED"
+  project_id = "b5fc4c48-e951-442f-97ca-b3e800c143cd"
+  value      = try(each.value.redis.TLS_ENABLED, "no")
+}
+
+resource "kubernetes_secret_v1" "automatic-redis-secret" {
+  for_each = { for key, value in var.kubernetes_input : key => value if value.redis != null && value.enabled == true }
+  metadata {
+    name      = "${each.key}-redis-terraform"
+    namespace = coalesce(each.value.namespace, each.value.connected_namespace, each.key)
+  }
+
+  data = {
+    REDIS_HOSTNAME         = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_redis_host[each.key].value}"
+    REDIS_PORT             = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_redis_port[each.key].value}"
+    REDIS_REPLICATION_MODE = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_redis_REPLICATION_MODE[each.key].value}"
+    REDIS_TLS_ENABLED      = "${resource.bitwarden-secrets_secret.automatic_bitwarden_secret_redis_TLS_ENABLED[each.key].value}"
+  }
+
+}

modules/services/main.tf

@@ -1,58 +1,14 @@
 variable "kubernetes_input" {
   type = map(object({
-    name   = optional(string)
     docker = optional(bool)
-    image  = string
-    pvc = optional(map(object({
-      name                 = optional(string)
-      config_map           = optional(bool, false)
-      secret               = optional(bool, false)
-      local_path           = optional(bool, false)
-      host_path            = optional(string)
-      storage_class_name   = optional(string, "nfs-storage-intelligent")
-      annotations_fileType = optional(string)
-      mount_path           = string
-      sub_path             = optional(string)
-    })))
-    environment = optional(map(object({
-      name  = optional(string)
-      value = optional(string)
-      value_from = optional(object({
-        secret_key_ref = object({
-          name = string
-          key  = optional(string, null)
-        })
-      }))
-    })))
-    replicas               = optional(number, 1)
     namespace              = optional(string)
     connected_namespace    = optional(string, "")
-    command                = optional(list(string))
     service_port           = optional(list(number))
-    external_port          = optional(bool, false)
     service_type           = optional(string, "ClusterIP")
-    service_name           = optional(string)
-    domain_name            = optional(list(string))
-    legacy_domain          = optional(bool, false)
-    exposed                = optional(bool, true)
-    liveness_tcp_socket    = optional(number)
-    liveness_http_get      = optional(string)
-    liveness_http_get_path = optional(string)
     database               = optional(map(string))
-    database_command       = optional(list(string))
-    database_args          = optional(list(string))
     redis                  = optional(map(string))
     enabled                = optional(bool, true)
-    secret_ref             = optional(list(string))
+
-    config_map_ref         = optional(list(string))
-    config_map_import      = optional(list(string))
-    secret_import          = optional(list(string))
-    extra_manifest         = optional(list(string))
-    requirements           = optional(map(string))
-    dns_nameservers        = optional(string)
-    service_account_name   = optional(string)
-    environment_variables  = optional(map(string), { name = "value" })
-    security_context       = optional(bool, false)
   }))
 
 }