Merge branch 'gcp' into azure-dev

Author: prajwalakhuj

README.md

@@ -117,6 +117,9 @@ No requirements.
 | <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | Version of the Mongodb chart that will be used to deploy Mongodb application. | `string` | `"13.1.5"` | no |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | Specifies the name of the EKS cluster to deploy the Mongodb application on. | `string` | `""` | no |
 | <a name="input_create_namespace"></a> [create\_namespace](#input\_create\_namespace) | Specify whether or not to create the namespace if it does not already exist. Set it to true to create the namespace. | `string` | `true` | no |
+| <a name="input_iam_role_arn_backup"></a> [iam\_role\_arn\_backup](#input\_iam\_role\_arn\_backup) | IAM role ARN for backup (AWS) | `string` | `""` | no |
+| <a name="input_iam_role_arn_restore"></a> [iam\_role\_arn\_restore](#input\_iam\_role\_arn\_restore) | IAM role ARN for restore (AWS) | `string` | `""` | no |
+| <a name="input_metric_exporter_pasword"></a> [metric\_exporter\_pasword](#input\_metric\_exporter\_pasword) | Metric exporter password for MongoDB | `string` | `""` | no |
 | <a name="input_mongodb_backup_config"></a> [mongodb\_backup\_config](#input\_mongodb\_backup\_config) | Configuration options for Mongodb database backups. It includes properties such as the S3 bucket URI, the S3 bucket region, and the cron expression for full backups. | `any` | <pre>{<br>  "bucket_uri": "",<br>  "cron_for_full_backup": "*/5 * * * *",<br>  "s3_bucket_region": "us-east-2"<br>}</pre> | no |
 | <a name="input_mongodb_backup_enabled"></a> [mongodb\_backup\_enabled](#input\_mongodb\_backup\_enabled) | Specifies whether to enable backups for Mongodb database. | `bool` | `false` | no |
 | <a name="input_mongodb_config"></a> [mongodb\_config](#input\_mongodb\_config) | Specify the configuration settings for Mongodb, including the name, environment, storage options, replication settings, and custom YAML values. | `any` | <pre>{<br>  "architecture": "",<br>  "environment": "",<br>  "name": "",<br>  "replica_count": 2,<br>  "storage_class_name": "",<br>  "store_password_to_secret_manager": true,<br>  "values_yaml": "",<br>  "volume_size": ""<br>}</pre> | no |
@@ -132,6 +135,10 @@ No requirements.
 | <a name="input_resource_group_location"></a> [resource\_group\_location](#input\_resource\_group\_location) | Azure region | `string` | `"East US"` | no |
 | <a name="input_resource_group_name"></a> [resource\_group\_name](#input\_resource\_group\_name) | Azure Resource Group name | `string` | `""` | no |
 | <a name="input_storage_account_name"></a> [storage\_account\_name](#input\_storage\_account\_name) | Azure storage account name | `string` | `""` | no |
+| <a name="input_root_password"></a> [root\_password](#input\_root\_password) | Root password for MongoDB | `string` | `""` | no |
+| <a name="input_service_account_backup"></a> [service\_account\_backup](#input\_service\_account\_backup) | Service account for backup (GCP) | `string` | `""` | no |
+| <a name="input_service_account_restore"></a> [service\_account\_restore](#input\_service\_account\_restore) | Service account for restore (GCP) | `string` | `""` | no |
+
 
 ## Outputs
 

example/complete/aws/README.md

@@ -21,6 +21,7 @@ No requirements.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_aws"></a> [aws](#module\_aws) | squareops/mongodb/kubernetes//provider/aws | n/a |
 | <a name="module_mongodb"></a> [mongodb](#module\_mongodb) | squareops/mongodb/kubernetes | n/a |
 
 ## Resources

example/complete/aws/helm/values.yaml

@@ -3,7 +3,7 @@ affinity:
     requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
         - matchExpressions:
-          - key: "Addon-Services"
+          - key: "Data-Services"
             operator: In
             values:
             - "true"

example/complete/aws/main.tf

@@ -17,17 +17,17 @@ locals {
   }
 }
 module "aws" {
-  source                             = "../../../provider/aws"
+  source                             = "squareops/mongodb/kubernetes//provider/aws"
   environment                        = local.environment
   name                               = local.name
   store_password_to_secret_manager   = local.store_password_to_secret_manager
-  cluster_name                       = "dev-cluster"
+  cluster_name                       = "ipv6-shib"
   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 = "squareops/mongodb/kubernetes"
   mongodb_config = {
     name                             = local.name
     values_yaml                      = file("./helm/values.yaml")
@@ -46,19 +46,16 @@ module "mongodb" {
   mongodb_backup_enabled             = true
   iam_role_arn_backup                = module.aws.iam_role_arn_backup
   mongodb_backup_config = {
-    s3_bucket_uri        = "s3://bucket_name"
-    s3_bucket_region     = "bucket_region"
+    bucket_uri           = "s3://mongo-demo-backup"
+    s3_bucket_region     = "us-east-2"
     cron_for_full_backup = "* * * * *"
   }
   mongodb_restore_enabled = true
   iam_role_arn_restore    = module.aws.iam_role_arn_restore
   mongodb_restore_config = {
-    s3_bucket_uri              = "s3://bucket_name/filename"
-    s3_bucket_region           = "bucket_region"
-    full_restore_enable        = true
-    file_name_full             = "filename"
-    incremental_restore_enable = false
-    file_name_incremental      = ""
+    bucket_uri       = "s3://mongo-demo-backup/mongodumpfull_20230523_092110.gz"
+    s3_bucket_region = "us-east-2"
+    file_name        = "mongodumpfull_20230523_092110.gz"
   }
   mongodb_exporter_enabled = true
 }

example/complete/gcp/README.md

@@ -22,6 +22,7 @@ No requirements.
 
 | Name | Source | Version |
 |------|--------|---------|
+| <a name="module_gcp"></a> [gcp](#module\_gcp) | squareops/mongodb/kubernetes//provider/gcp | n/a |
 | <a name="module_mongodb"></a> [mongodb](#module\_mongodb) | squareops/mongodb/kubernetes | n/a |
 
 ## Resources

example/complete/gcp/helm/values.yaml

@@ -3,7 +3,7 @@ affinity:
     requiredDuringSchedulingIgnoredDuringExecution:
         nodeSelectorTerms:
         - matchExpressions:
-          - key: "Infra-Services"
+          - key: "Data-Services"
             operator: In
             values:
             - "true"

example/complete/gcp/main.tf

@@ -18,8 +18,8 @@ locals {
 }
 
 module "gcp" {
-  source                             = "../../../provider/gcp"
-  project_id                         = "fresh-sanctuary-389006" #for gcp
+  source                             = "squareops/mongodb/kubernetes//provider/gcp"
+  project_id                         = "fresh-sanctuary-387476" #for gcp
   environment                        = local.environment
   name                               = local.name
   store_password_to_secret_manager   = local.store_password_to_secret_manager
@@ -29,8 +29,8 @@ module "gcp" {
 
 
 module "mongodb" {
-  source       = "../../../" #"squareops/mongodb/kubernetes"
-  cluster_name = "skaf-dev-gke-cluster"
+  source       = "squareops/mongodb/kubernetes"
+  cluster_name = "dev-gke-cluster"
   mongodb_config = {
     name                             = local.name
     values_yaml                      = file("./helm/values.yaml")
@@ -50,13 +50,13 @@ module "mongodb" {
   service_account_restore            = module.gcp.service_account_restore
   mongodb_backup_enabled             = true
   mongodb_backup_config = {
-    bucket_uri           = "gs://mongo-backup-skaf"
+    bucket_uri           = "gs://mongo-backup-dev"
     s3_bucket_region     = ""
     cron_for_full_backup = "* * * * *"
   }
   mongodb_restore_enabled = true
   mongodb_restore_config = {
-    bucket_uri       = "gs://mongo-backup-skaf/mongodumpfull_20230710_132301.gz"
+    bucket_uri       = "gs://mongo-backup-dev/mongodumpfull_20230710_132301.gz"
     s3_bucket_region = ""
     file_name        = "mongodumpfull_20230710_132301.gz"
 

example/complete/gcp/provider.tf

@@ -1,9 +1,9 @@
 data "google_client_config" "default" {}
 
 data "google_container_cluster" "primary" {
-  name     = "skaf-dev-gke-cluster"
+  name     = "dev-gke-cluster"
   location = "asia-south1"
-  project  = "fresh-sanctuary-389006"
+  project  = "fresh-sanctuary-3894579"
 }
 
 provider "kubernetes" {
@@ -19,14 +19,3 @@ provider "helm" {
     cluster_ca_certificate = base64decode(data.google_container_cluster.primary.master_auth.0.cluster_ca_certificate)
   }
 }
-
-provider "google" {
-  region  = "asia-south1"
-  project = "fresh-sanctuary-389006"
-}
-
-provider "aws" {
-  alias      = "aws"
-  access_key = null
-  secret_key = null
-}

output.tf

@@ -10,8 +10,8 @@ output "mongodb_credential" {
   description = "MongoDB credentials used for accessing the MongoDB database."
   value = var.mongodb_config.store_password_to_secret_manager ? null : {
     root_user                = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.root_user : "root",
-    root_password            = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.root_password : nonsensitive(random_password.mongodb_root_password[0].result),
+    root_password            = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.root_password : var.root_password,
     metric_exporter_user     = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.metric_exporter_user : "mongodb_exporter",
-    metric_exporter_password = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.metric_exporter_password : nonsensitive(random_password.mongodb_exporter_password[0].result)
+    metric_exporter_password = var.mongodb_custom_credentials_enabled ? var.mongodb_custom_credentials_config.metric_exporter_password : var.metric_exporter_password
   }
 }

provider/aws/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"
-}
+}