From 5b406f212413765eac29c0587aca3beaa4d42168 Mon Sep 17 00:00:00 2001 From: devops0706 Date: Thu, 16 Nov 2023 15:15:29 +0530 Subject: [PATCH 1/2] added variable postgres_config --- examples/complete/aws/main.tf | 8 ++------ modules/resources/aws/variables.tf | 12 ++++++++++++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/examples/complete/aws/main.tf b/examples/complete/aws/main.tf index ea41bab..6abe03f 100644 --- a/examples/complete/aws/main.tf +++ b/examples/complete/aws/main.tf @@ -8,7 +8,7 @@ locals { Department = "Engineering" } store_password_to_secret_manager = true - custom_credentials_enabled = true + custom_credentials_enabled = false custom_credentials_config = { postgres_password = "60rbJs901a6Oa9hzUM5x7s8Q" repmgr_password = "IWHLlEYOt25jL4Io7pancB" @@ -19,7 +19,7 @@ module "aws" { source = "git@github.com:sq-ia/terraform-kubernetes-postgresql.git//modules/resources/aws" name = local.name environment = local.environment - cluster_name = "cluster-name" + cluster_name = "devak-skaf" store_password_to_secret_manager = local.store_password_to_secret_manager custom_credentials_enabled = local.custom_credentials_enabled custom_credentials_config = local.custom_credentials_config @@ -35,9 +35,5 @@ module "postgresql" { storage_class = "gp2" postgresql_values = file("./helm/postgresql.yaml") store_password_to_secret_manager = local.store_password_to_secret_manager - custom_credentials_enabled = local.custom_credentials_enabled - custom_credentials_config = local.custom_credentials_config - postgres_password = local.custom_credentials_enabled ? "" : module.aws.postgresql_credential.postgres_password - repmgr_password = local.custom_credentials_enabled ? "" : module.aws.postgresql_credential.repmgr_password } } diff --git a/modules/resources/aws/variables.tf b/modules/resources/aws/variables.tf index aebd79b..5b24df0 100644 --- a/modules/resources/aws/variables.tf +++ b/modules/resources/aws/variables.tf @@ -39,3 +39,15 @@ variable "store_password_to_secret_manager" { type = bool default = false } + +variable "postgresql_config" { + description = "Custom credentials configuration." + default = { + name = "" + environment = "" + replicaCount = 3 + storage_class = "gp2" + postgresql_values = "" + store_password_to_secret_manager = true + } +} From 4edf0bba4cdc5842b89f851f1ec36e0d60f5fe75 Mon Sep 17 00:00:00 2001 From: devops0706 Date: Thu, 16 Nov 2023 15:19:32 +0530 Subject: [PATCH 2/2] changed cluster name value --- examples/complete/aws/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/complete/aws/main.tf b/examples/complete/aws/main.tf index 6abe03f..3afe4f6 100644 --- a/examples/complete/aws/main.tf +++ b/examples/complete/aws/main.tf @@ -19,7 +19,7 @@ module "aws" { source = "git@github.com:sq-ia/terraform-kubernetes-postgresql.git//modules/resources/aws" name = local.name environment = local.environment - cluster_name = "devak-skaf" + cluster_name = "cluster-name" store_password_to_secret_manager = local.store_password_to_secret_manager custom_credentials_enabled = local.custom_credentials_enabled custom_credentials_config = local.custom_credentials_config