From 27e1ed922ac5fa636a9f170ee4506ed7ffbaa2d6 Mon Sep 17 00:00:00 2001 From: pierre Date: Mon, 2 Dec 2024 15:16:07 +0000 Subject: [PATCH] add the secret as a loop --- module.tf | 8 +++---- onitama_secret.yaml | 10 ++++++++ variables.auto.tfvars | 53 +++++++++++++++++++++++++++++++++++-------- 3 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 onitama_secret.yaml diff --git a/module.tf b/module.tf index 011b6b1..f84ab6b 100644 --- a/module.tf +++ b/module.tf @@ -330,7 +330,7 @@ resource "kubernetes_deployment_v1" "database-automatic" { for_each = { for key, value in var.kubernetes : key => value if value.enabled == true } metadata { namespace = coalesce(each.value.namespace, each.key) - name = coalesce(each.value.namespace, each.key) + name = "${coalesce(each.value.namespace, each.key)}-db" labels = { app = each.key deployment_method = "Terraform" @@ -343,14 +343,14 @@ resource "kubernetes_deployment_v1" "database-automatic" { selector { match_labels = { - app = each.key + app = "${each.key}-db" } } template { metadata { labels = { - app = each.key + app = "${each.key}-db" deployment_method = "Terraform" database = "true" } @@ -363,7 +363,7 @@ resource "kubernetes_deployment_v1" "database-automatic" { port { container_port = 5432 - name = 5432 + name = "database-port" } diff --git a/onitama_secret.yaml b/onitama_secret.yaml new file mode 100644 index 0000000..9c9c472 --- /dev/null +++ b/onitama_secret.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +data: + POSTGRES_DB: dGVzdA== + POSTGRES_USER: dGVzdA== + POSTGRES_PASSWORD: dGVzdA== +kind: Secret +metadata: + name: mysecret + namespace: onitama +type: Opaque diff --git a/variables.auto.tfvars b/variables.auto.tfvars index 0324dc3..d634c5d 100644 --- a/variables.auto.tfvars +++ b/variables.auto.tfvars @@ -27,7 +27,9 @@ kubernetes = { image = "ghcr.io/jackadamson/onitama:latest" service_port = 8080 database = { - +# username = "username" +# database = "database" +# password = "password" } requirements = { limits-cpu = "50m" @@ -36,14 +38,47 @@ kubernetes = { requests-memory = "25Mi" } environment = { - MY_VAR = { + # MY_VAR = { + # value_from = { + # secret_key_ref = { + # name = "mysecret" + # key = "latest" + # } + # } + # } + POSTGRES_DB = { value_from = { secret_key_ref = { name = "mysecret" - key = "latest" + key = "POSTGRES_DB" } } } + POSTGRES_USER = { + value_from = { + secret_key_ref = { + name = "mysecret" + key = "POSTGRES_USER" + } + } + } + POSTGRES_PASSWORD = { + value_from = { + secret_key_ref = { + name = "mysecret" + key = "POSTGRES_PASSWORD" + } + } + } + # POSTGRES_DB = { + # value = "db" + # } + # POSTGRES_USER = { + # value = "user" + # } + # POSTGRES_PASSWORD = { + # value = "password" + # } PORT = { value = "80" } @@ -59,12 +94,12 @@ kubernetes = { pvc_size = "1Mi" mount_path = "/code" } -# database = { -# name = "databaseonitama" -# pvc_size = "1Mi" -# mount_path = "/sql" -# database = true -# } + # database = { + # name = "databaseonitama" + # pvc_size = "1Mi" + # mount_path = "/sql" + # database = true + # } } }