pi-ux-ce/Terraform_kube
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

enable PVC as well and redis/db

Browse Source
This commit is contained in:
pi-ux-ce
2025-05-06 13:40:57 +01:00
parent fcdcb0102d
commit b094e78620
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module.tf
+8 -10
View File
@@ -69,7 +69,7 @@ locals {
pvc_size = pvc.pvc_size pvc_size = pvc.pvc_size
mount_path = pvc.mount_path mount_path = pvc.mount_path
storage_class_name = pvc.storage_class_name storage_class_name = pvc.storage_class_name
namespace = coalesce(value.namespace, key) namespace = coalesce(value.namespace,value.connected_namespace, key)
}] if value.enabled == true && value.pvc != null }] if value.enabled == true && value.pvc != null
]) ])
} }
@@ -88,7 +88,6 @@ locals {
data "kubernetes_all_namespaces" "allns" {} data "kubernetes_all_namespaces" "allns" {}
resource "kubernetes_namespace" "automatic" { resource "kubernetes_namespace" "automatic" {
# for_each = { for key, value in var.kubernetes : key => value if value.enabled == true && !(value.block_namespace_creation) }
for_each = { for key, value in var.kubernetes : key => value if value.enabled == true && value.connected_namespace == "" } for_each = { for key, value in var.kubernetes : key => value if value.enabled == true && value.connected_namespace == "" }
metadata { metadata {
annotations = { annotations = {
@@ -127,10 +126,9 @@ resource "kubernetes_manifest" "service" {
resource "kubernetes_persistent_volume_claim" "automatic-pvc" { resource "kubernetes_persistent_volume_claim" "automatic-pvc" {
# for_each = { for key, value in var.kubernetes : key => value if value.enabled == true }
for_each = { for key, value in local.pvc_details : "${value.index}" => merge(value, { mew_key = value.index }) if value.pvc } for_each = { for key, value in local.pvc_details : "${value.index}" => merge(value, { mew_key = value.index }) if value.pvc }
metadata { metadata {
namespace = each.value.namespace namespace = coalesce(each.value.namespace, each.key)
name = "${each.value.name}-pvc" name = "${each.value.name}-pvc"
labels = { labels = {
deployment_method = "Terraform" deployment_method = "Terraform"
@@ -149,7 +147,7 @@ resource "kubernetes_persistent_volume_claim" "automatic-pvc" {
resource "kubernetes_persistent_volume_claim" "automatic-pvc-database" { resource "kubernetes_persistent_volume_claim" "automatic-pvc-database" {
for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true } for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
metadata { metadata {
namespace = each.value.namespace namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
name = "${each.key}-db-pvc" name = "${each.key}-db-pvc"
labels = { labels = {
deployment_method = "Terraform" deployment_method = "Terraform"
@@ -169,7 +167,7 @@ resource "kubernetes_persistent_volume_claim" "automatic-pvc-database" {
resource "kubernetes_persistent_volume_claim" "automatic-pvc-redis" { resource "kubernetes_persistent_volume_claim" "automatic-pvc-redis" {
for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true } for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
metadata { metadata {
namespace = each.value.namespace namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
name = "${each.key}-redis-pvc" name = "${each.key}-redis-pvc"
labels = { labels = {
deployment_method = "Terraform" deployment_method = "Terraform"
@@ -221,7 +219,7 @@ resource "kubernetes_service" "automatic_service_database" {
for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true } for_each = { for key, value in var.kubernetes : key => value if value.database != null && value.enabled == true }
metadata { metadata {
name = "${each.key}-db-svc" name = "${each.key}-db-svc"
namespace = coalesce(each.value.namespace, each.key) namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
labels = { labels = {
deployment_method = "Terraform" deployment_method = "Terraform"
} }
@@ -246,7 +244,7 @@ resource "kubernetes_service" "automatic_service_redis" {
for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true } for_each = { for key, value in var.kubernetes : key => value if value.redis != null && value.enabled == true }
metadata { metadata {
name = "${each.key}-redis-svc" name = "${each.key}-redis-svc"
namespace = coalesce(each.value.namespace, each.key) namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
labels = { labels = {
deployment_method = "Terraform" deployment_method = "Terraform"
} }
@@ -454,7 +452,7 @@ resource "kubernetes_deployment_v1" "database-automatic" {
metadata { metadata {
namespace = coalesce(each.value.namespace, each.key) namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
name = "${coalesce(each.value.namespace, each.key)}-db" name = "${coalesce(each.value.namespace, each.key)}-db"
labels = { labels = {
app = each.key app = each.key
@@ -579,7 +577,7 @@ resource "kubernetes_deployment_v1" "redis-automatic" {
metadata { metadata {
namespace = coalesce(each.value.namespace, each.key) namespace = coalesce(each.value.namespace,each.value.connected_namespace, each.key)
name = "${coalesce(each.value.namespace, each.key)}-redis" name = "${coalesce(each.value.namespace, each.key)}-redis"
labels = { labels = {
app = each.key app = each.key
variables.auto.tfvars
+2 -1
View File
@@ -735,7 +735,8 @@ kubernetes = {
} }
pinchflat = { pinchflat = {
enabled = false # enabled = false
connected_namespace = "screeps"
image = "ghcr.io/kieraneglin/pinchflat:latest" image = "ghcr.io/kieraneglin/pinchflat:latest"
service_port = 8945 service_port = 8945