added custom db and namespace enable/disable param

Ad-squareops · Ad-squareops · commit 966b2e108f33 · 2023-08-25T19:06:59.000+05:30
diff --git a/IAM.md b/IAM.md
@@ -82,4 +82,4 @@ The Policy required to deploy this module:
     "resourcemanager.projects.getIamPolicy",
     "resourcemanager.projects.setIamPolicy"
   ]
-  ```
+  ```
diff --git a/examples/complete/aws/helm/values.yaml b/examples/complete/aws/helm/values.yaml
@@ -3,7 +3,7 @@ affinity:
     requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
         - matchExpressions:
-          - key: "Data-Services"
+          - key: "Infra-Services"
             operator: In
             values:
             - "true"
diff --git a/examples/complete/aws/main.tf b/examples/complete/aws/main.tf
@@ -7,6 +7,8 @@ locals {
     Expires    = "Never"
     Department = "Engineering"
   }
+  create_namespace                   = false
+  namespace                          = ""
   store_password_to_secret_manager   = true
   mongodb_custom_credentials_enabled = true
   mongodb_custom_credentials_config = {
@@ -17,31 +19,37 @@ locals {
   }
 }
 module "aws" {
-  source                             = "squareops/mongodb/kubernetes//modules/resources/aws"
+  source                             = "../../../modules/resources/aws"
   environment                        = local.environment
   name                               = local.name
   store_password_to_secret_manager   = local.store_password_to_secret_manager
-  cluster_name                       = "ipv6-shib"
+  cluster_name                       = "dev-skaf"
   mongodb_custom_credentials_enabled = local.mongodb_custom_credentials_enabled
   mongodb_custom_credentials_config  = local.mongodb_custom_credentials_config
 }
 
 module "mongodb" {
-  source = "squareops/mongodb/kubernetes"
+  source           = "../../../"
+  namespace        = local.namespace
+  create_namespace = local.create_namespace
   mongodb_config = {
     name                             = local.name
+    namespace                        = local.namespace
     values_yaml                      = file("./helm/values.yaml")
     environment                      = local.environment
     volume_size                      = "10Gi"
     architecture                     = "replicaset"
+    custom_databases                 = "['db1', 'db2']"
+    custom_databases_usernames       = "['admin', 'admin']"
+    custom_databases_passwords       = "['pass1', 'pass2']"
     replica_count                    = 2
-    storage_class_name               = "gp3"
+    storage_class_name               = "gp2"
     store_password_to_secret_manager = local.store_password_to_secret_manager
   }
   mongodb_custom_credentials_enabled = local.mongodb_custom_credentials_enabled
   mongodb_custom_credentials_config  = local.mongodb_custom_credentials_config
   root_password                      = local.mongodb_custom_credentials_enabled ? "" : module.aws.root_password
-  metric_exporter_pasword            = local.mongodb_custom_credentials_enabled ? "" : module.aws.metric_exporter_pasword
+  metric_exporter_password           = local.mongodb_custom_credentials_enabled ? "" : module.aws.metric_exporter_password
   bucket_provider_type               = "s3"
   mongodb_backup_enabled             = true
   iam_role_arn_backup                = module.aws.iam_role_arn_backup
diff --git a/examples/complete/aws/provider.tf b/examples/complete/aws/provider.tf
@@ -6,11 +6,11 @@ provider "aws" {
 }
 
 data "aws_eks_cluster" "cluster" {
-  name = ""
+  name = "dev-skaf"
 }
 
 data "aws_eks_cluster_auth" "cluster" {
-  name = ""
+  name = "dev-skaf"
 }
 
 provider "kubernetes" {
diff --git a/examples/complete/azure/main.tf b/examples/complete/azure/main.tf
@@ -7,6 +7,8 @@ locals {
     Expires    = "Never"
     Department = "Engineering"
   }
+  create_namespace                   = false
+  namespace                          = ""
   store_password_to_secret_manager   = true
   mongodb_custom_credentials_enabled = true
   mongodb_custom_credentials_config = {
@@ -35,22 +37,28 @@ module "azure" {
 module "mongodb" {
   source                  = "squareops/mongodb/kubernetes"
   cluster_name            = ""
+  namespace               = local.namespace
+  create_namespace        = local.create_namespace
   resource_group_name     = ""
   resource_group_location = ""
   mongodb_config = {
     name                             = local.name
+    namespace                        = local.namespace
     values_yaml                      = file("./helm/values.yaml")
     volume_size                      = "10Gi"
     architecture                     = "replicaset"
     replica_count                    = 1
     environment                      = local.environment
+    custom_databases                 = "['db1', 'db2']"
+    custom_databases_usernames       = "['admin', 'admin']"
+    custom_databases_passwords       = "['pass1', 'pass2']"
     storage_class_name               = "infra-service-sc"
     store_password_to_secret_manager = local.store_password_to_secret_manager
   }
   mongodb_custom_credentials_enabled = local.mongodb_custom_credentials_enabled
   mongodb_custom_credentials_config  = local.mongodb_custom_credentials_config
   root_password                      = local.mongodb_custom_credentials_enabled ? "" : module.azure.root_password
-  metric_exporter_pasword            = local.mongodb_custom_credentials_enabled ? "" : module.azure.metric_exporter_pasword
+  metric_exporter_password           = local.mongodb_custom_credentials_enabled ? "" : module.azure.metric_exporter_pasword
   bucket_provider_type               = "azure"
   mongodb_backup_enabled             = false
   mongodb_backup_config = {
diff --git a/examples/complete/azure/output.tf b/examples/complete/azure/output.tf
@@ -6,4 +6,4 @@ output "mongodb_endpoints" {
 output "mongodb_credential" {
   value       = local.store_password_to_secret_manager ? null : module.mongodb.mongodb_credential
   description = "MongoDB credentials used for accessing the MongoDB database."
-}
+}
diff --git a/examples/complete/gcp/main.tf b/examples/complete/gcp/main.tf
@@ -7,6 +7,8 @@ locals {
     Expires    = "Never"
     Department = "Engineering"
   }
+  create_namespace                   = false
+  namespace                          = ""
   store_password_to_secret_manager   = true
   mongodb_custom_credentials_enabled = true
   mongodb_custom_credentials_config = {
@@ -29,22 +31,28 @@ module "gcp" {
 
 
 module "mongodb" {
-  source       = "squareops/mongodb/kubernetes"
-  cluster_name = "dev-gke-cluster"
+  source           = "squareops/mongodb/kubernetes"
+  namespace        = local.namespace
+  create_namespace = local.create_namespace
+  cluster_name     = "dev-gke-cluster"
   mongodb_config = {
     name                             = local.name
+    namespace                        = local.namespace
     values_yaml                      = file("./helm/values.yaml")
     environment                      = local.environment
     volume_size                      = "10Gi"
     architecture                     = "replicaset"
+    custom_databases                 = "['db1', 'db2']"
+    custom_databases_usernames       = "['admin', 'admin']"
+    custom_databases_passwords       = "['pass1', 'pass2']"
     replica_count                    = 2
     storage_class_name               = "standard"
     store_password_to_secret_manager = local.store_password_to_secret_manager
   }
   mongodb_custom_credentials_enabled = local.mongodb_custom_credentials_enabled
   mongodb_custom_credentials_config  = local.mongodb_custom_credentials_config
   root_password                      = local.mongodb_custom_credentials_enabled ? "" : module.gcp.root_password
-  metric_exporter_pasword            = local.mongodb_custom_credentials_enabled ? "" : module.gcp.metric_exporter_pasword
+  metric_exporter_password           = local.mongodb_custom_credentials_enabled ? "" : module.gcp.metric_exporter_pasword
   bucket_provider_type               = "gcs"
   service_account_backup             = module.gcp.service_account_backup
   service_account_restore            = module.gcp.service_account_restore
diff --git a/helm/values/backup/values.yaml b/helm/values/backup/values.yaml
@@ -14,4 +14,4 @@ backup:
 annotations:
   ${annotations}
 
-bucket_provider_type: ${bucket_provider_type}
+bucket_provider_type: ${bucket_provider_type}
diff --git a/helm/values/exporter/values.yaml b/helm/values/exporter/values.yaml
@@ -24,7 +24,7 @@ livenessProbe:
 
 # [mongodb[+srv]://][user:pass@]host1[:port1][,host2[:port2],...][/database][?options]
 mongodb:
-  uri: "mongodb://mongodb_exporter:${mongodb_exporter_password}@mongodb-0.mongodb-headless.mongodb.svc.cluster.local:27017/admin?authSource=admin"
+  uri: "mongodb://mongodb_exporter:${mongodb_exporter_password}@mongodb-0.mongodb-headless.{namespace}.svc.cluster.local:27017/admin?authSource=admin"
 
 # Name of an externally managed secret (in the same namespace) containing the connection uri as key `mongodb-uri`.
 # If this is provided, the value mongodb.uri is ignored.
diff --git a/helm/values/mongodb/values.yaml b/helm/values/mongodb/values.yaml
@@ -153,9 +153,9 @@ auth:
   ## @param auth.passwords List of passwords for the custom users set at `auth.usernames`
   ## @param auth.databases List of custom databases to be created during the initialization
   ##
-  usernames: []
-  passwords: []
-  databases: []
+  usernames: ${custom_databases_usernames}
+  passwords: ${custom_databases_passwords}
+  databases: ${custom_databases}
   ## @param auth.username DEPRECATED: use `auth.usernames` instead
   ## @param auth.password DEPRECATED: use `auth.passwords` instead
   ## @param auth.database DEPRECATED: use `auth.databases` instead
diff --git a/main.tf b/main.tf
@@ -24,22 +24,25 @@ resource "kubernetes_namespace" "mongodb" {
 
 resource "helm_release" "mongodb" {
   depends_on = [kubernetes_namespace.mongodb]
-  name       = "mongodb"
+  name       = "modb"
   chart      = "mongodb"
   version    = var.chart_version
   timeout    = 600
-  namespace  = var.namespace
+  namespace  = var.create_namespace ? var.namespace : "default"
   repository = "https://charts.bitnami.com/bitnami"
   values = [
     templatefile("${path.module}/helm/values/mongodb/values.yaml", {
-      namespace                  = var.namespace,
+      namespace                  = var.create_namespace ? var.namespace : "default",
       app_version                = var.app_version,
       volume_size                = var.mongodb_config.volume_size,
       architecture               = var.mongodb_config.architecture,
       replicacount               = var.mongodb_config.replica_count,
       arbiterValue               = local.arbiterValue,
+      custom_databases           = var.mongodb_config.custom_databases
+      custom_databases_usernames = var.mongodb_config.custom_databases_usernames
+      custom_databases_passwords = var.mongodb_config.custom_databases_passwords
       storage_class_name         = var.mongodb_config.storage_class_name,
-      mongodb_exporter_password  = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.metric_exporter_password : var.metric_exporter_pasword,
+      mongodb_exporter_password  = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.metric_exporter_password : var.metric_exporter_password,
       mongodb_root_user_password = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.root_password : var.root_password
     }),
     var.mongodb_config.values_yaml
@@ -52,7 +55,7 @@ resource "helm_release" "mongodb_backup" {
   name       = "mongodb-backup"
   chart      = "${path.module}/modules/backup"
   timeout    = 600
-  namespace  = var.namespace
+  namespace  = var.create_namespace ? var.namespace : "default"
   values = [
     templatefile("${path.module}/helm/values/backup/values.yaml", {
       mongodb_root_user_password = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.root_password : var.root_password,
@@ -63,7 +66,7 @@ resource "helm_release" "mongodb_backup" {
       azure_storage_account_name = var.bucket_provider_type == "azure" ? var.azure_storage_account_name : ""
       azure_storage_account_key  = var.bucket_provider_type == "azure" ? var.azure_storage_account_key : ""
       azure_container_name       = var.bucket_provider_type == "azure" ? var.azure_container_name : ""
-      annotations                = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn : ${var.iam_role_arn_backup}" : var.bucket_provider_type == "gcs" ? "iam.gke.io/gcp-service-account: ${var.service_account_backup}" : var.bucket_provider_type == "azure" ? "azure.workload.identity/client-id: ${var.az_account_backup}" : ""      
+      annotations                = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn : ${var.iam_role_arn_backup}" : var.bucket_provider_type == "gcs" ? "iam.gke.io/gcp-service-account: ${var.service_account_backup}" : var.bucket_provider_type == "azure" ? "azure.workload.identity/client-id: ${var.az_account_backup}" : ""
     })
   ]
 }
@@ -75,7 +78,7 @@ resource "helm_release" "mongodb_restore" {
   name       = "mongodb-restore"
   chart      = "${path.module}/modules/restore"
   timeout    = 600
-  namespace  = var.namespace
+  namespace  = var.create_namespace ? var.namespace : "default"
   values = [
     templatefile("${path.module}/helm/values/restore/values.yaml", {
       mongodb_root_user_password = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.root_password : var.root_password,
@@ -98,12 +101,12 @@ resource "helm_release" "mongodb_exporter" {
   chart      = "prometheus-mongodb-exporter"
   version    = var.mongodb_exporter_config.version
   timeout    = 600
-  namespace  = var.namespace
+  namespace  = var.create_namespace ? var.namespace : "default"
   repository = "https://prometheus-community.github.io/helm-charts"
   values = [
     templatefile("${path.module}/helm/values/exporter/values.yaml", {
-      mongodb_exporter_password = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.metric_exporter_password : "${var.metric_exporter_pasword}"
-      service_monitor_namespace = var.namespace
+      mongodb_exporter_password = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.metric_exporter_password : "${var.metric_exporter_password}"
+      service_monitor_namespace = var.create_namespace ? var.namespace : "default"
     }),
     var.mongodb_config.values_yaml
   ]
diff --git a/modules/resources/azure/outputs.tf b/modules/resources/azure/outputs.tf
@@ -16,4 +16,4 @@ output "root_password" {
 output "metric_exporter_pasword" {
   value       = var.mongodb_custom_credentials_enabled ? null : nonsensitive(random_password.mongodb_exporter_password[0].result)
   description = "mongodb_exporter user's password of MongoDB"
-}
+}
diff --git a/modules/resources/azure/variables.tf b/modules/resources/azure/variables.tf
@@ -88,4 +88,4 @@ variable "storage_account_name" {
   description = "Azure storage account name"
   type        = string
   default     = ""
-}
+}
diff --git a/modules/resources/gcp/outputs.tf b/modules/resources/gcp/outputs.tf
@@ -16,4 +16,4 @@ output "root_password" {
 output "metric_exporter_pasword" {
   value       = var.mongodb_custom_credentials_enabled ? null : nonsensitive(random_password.mongodb_exporter_password[0].result)
   description = "mongodb_exporter user's password of MongoDB"
-}
+}
diff --git a/output.tf b/output.tf
@@ -2,7 +2,7 @@ output "mongodb_endpoints" {
   description = "MongoDB endpoints in the Kubernetes cluster."
   value = {
     mongoport        = "27017",
-    mongodb_endpoint = "mongodb-headless.${var.namespace}.svc.cluster.local"
+    mongodb_endpoint = var.create_namespace ? "mongodb-headless.${var.namespace}.svc.cluster.local" : "mongodb-headless.default.svc.cluster.local"
   }
 }
 
diff --git a/variables.tf b/variables.tf
@@ -6,6 +6,9 @@ variable "mongodb_config" {
     volume_size                      = ""
     architecture                     = ""
     replica_count                    = 2
+    custom_databases                 = ""
+    custom_databases_usernames       = ""
+    custom_databases_passwords       = ""
     values_yaml                      = ""
     storage_class_name               = ""
     store_password_to_secret_manager = true
@@ -92,7 +95,7 @@ variable "cluster_name" {
 
 variable "create_namespace" {
   type        = string
-  default     = true
+  default     = false
   description = "Specify whether or not to create the namespace if it does not already exist. Set it to true to create the namespace."
 }
 
@@ -130,7 +133,7 @@ variable "root_password" {
   default     = ""
 }
 
-variable "metric_exporter_pasword" {
+variable "metric_exporter_password" {
   description = "Metric exporter password for MongoDB"
   type        = string
   default     = ""
@@ -199,4 +202,4 @@ variable "az_account_restore" {
   description = "Azure user managed account restore identity"
   type        = string
   default     = ""
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -82,4 +82,4 @@ The Policy required to deploy this module:`
`82`	`82`	`"resourcemanager.projects.getIamPolicy",`
`83`	`83`	`"resourcemanager.projects.setIamPolicy"`
`84`	`84`	`]`
`85`		- ```
	`85`	+ ```
Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,11 @@ provider "aws" {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`data "aws_eks_cluster" "cluster" {`
`9`		`- name = ""`
	`9`	`+ name = "dev-skaf"`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`data "aws_eks_cluster_auth" "cluster" {`
`13`		`- name = ""`
	`13`	`+ name = "dev-skaf"`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`provider "kubernetes" {`