added app version, custom db, namespace enable/disable param

Ad-squareops · Ad-squareops · commit 890353c3a6aa · 2023-08-28T11:42:33.000+05:30
diff --git a/examples/complete/aws/main.tf b/examples/complete/aws/main.tf
@@ -7,8 +7,10 @@ locals {
     Expires    = "Never"
     Department = "Engineering"
   }
-  store_password_to_secret_manager   = true
-  mysqldb_custom_credentials_enabled = false
+  create_namespace                   = false
+  namespace                          = ""
+  store_password_to_secret_manager   = false
+  mysqldb_custom_credentials_enabled = true
   mysqldb_custom_credentials_config = {
     root_user            = "root"
     root_password        = "RJDRIFsYC8ZS1WQuV0ps"
@@ -24,7 +26,7 @@ locals {
 
 module "aws" {
   source                             = "squareops/mysql/kubernetes//modules/resources/aws"
-  cluster_name                       = ""
+  cluster_name                       = "cluster-name"
   environment                        = local.environment
   name                               = local.name
   store_password_to_secret_manager   = local.store_password_to_secret_manager
@@ -34,13 +36,17 @@ module "aws" {
 }
 
 module "mysql" {
-  source = "squareops/mysql/kubernetes"
+  source           = "squareops/mysql/kubernetes/"
+  create_namespace = local.create_namespace
+  namespace        = local.namespace
   mysqldb_config = {
     name                             = local.name
     values_yaml                      = file("./helm/values.yaml")
+    app_version                      = "8.0.29-debian-11-r9"
     environment                      = local.environment
     architecture                     = "replication"
-    storage_class_name               = "gp3"
+    custom_database                  = "test_db"
+    storage_class_name               = "gp2"
     custom_user_username             = local.mysqldb_custom_credentials_enabled ? "" : local.custom_user_username
     primary_db_volume_size           = "10Gi"
     secondary_db_volume_size         = "10Gi"
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
   mysqldb_custom_credentials_enabled = false
   mysqldb_custom_credentials_config = {
@@ -40,12 +42,16 @@ module "azure" {
 }
 
 module "mysql" {
-  source = "squareops/mysql/kubernetes"
-  mysqldb_config = {
+  source           = "squareops/mysql/kubernetes"
+  create_namespace = local.create_namespace
+  namespace        = local.namespace
+  mysqldb_config   = {
     name                             = local.name
     values_yaml                      = file("./helm/values.yaml")
     environment                      = local.environment
+    app_version                      = "8.0.29-debian-11-r9"
     architecture                     = "replication"
+    custom_database                  = "test_db"
     storage_class_name               = "infra-service-sc"
     custom_user_username             = local.mysqldb_custom_credentials_enabled ? "" : local.custom_user_username
     primary_db_volume_size           = "10Gi"
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
   mysqldb_custom_credentials_enabled = false
   mysqldb_custom_credentials_config = {
@@ -34,12 +36,16 @@ module "gcp" {
 }
 
 module "mysql" {
-  source = "squareops/mysql/kubernetes"
-  mysqldb_config = {
+  source           = "squareops/mysql/kubernetes"
+  create_namespace = local.create_namespace
+  namespace        = local.namespace
+  mysqldb_config   = {
     name                             = local.name
     values_yaml                      = file("./helm/values.yaml")
     environment                      = local.environment
+    app_version                      = "8.0.29-debian-11-r9"
     architecture                     = "replication"
+    custom_database                  = "test_db"
     storage_class_name               = "standard"
     custom_user_username             = local.mysqldb_custom_credentials_enabled ? "" : local.custom_user_username
     primary_db_volume_size           = "10Gi"
diff --git a/helm/values/mysqldb/values.yaml b/helm/values/mysqldb/values.yaml
@@ -112,7 +112,7 @@ auth:
   ## @param auth.database Name for a custom database to create
   ## ref: https://github.com/bitnami/bitnami-docker-mysql/blob/master/README.md#creating-a-database-on-first-run
   ##
-  database: "my_database"
+  database: ${custom_database}
   ## @param auth.username Name for a custom user to create
   ## ref: https://github.com/bitnami/bitnami-docker-mysql/blob/master/README.md#creating-a-database-user-on-first-run
   ##
diff --git a/main.tf b/main.tf
@@ -12,12 +12,13 @@ resource "helm_release" "mysqldb" {
   chart      = "mysql"
   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/mysqldb/values.yaml", {
       app_version                 = var.app_version,
       architecture                = var.mysqldb_config.architecture,
+      custom_database             = var.mysqldb_config.custom_database,
       primary_pod_size            = var.mysqldb_config.primary_db_volume_size,
       secondary_pod_size          = var.mysqldb_config.secondary_db_volume_size,
       storage_class_name          = var.mysqldb_config.storage_class_name,
@@ -26,7 +27,7 @@ resource "helm_release" "mysqldb" {
       replication_password        = var.mysqldb_custom_credentials_enabled ? var.mysqldb_custom_credentials_config.replication_password : var.mysqldb_replication_user_password,
       mysqldb_root_password       = var.mysqldb_custom_credentials_enabled ? var.mysqldb_custom_credentials_config.root_password : var.root_password,
       mysqldb_exporter_enabled    = var.mysqldb_exporter_enabled,
-      service_monitor_namespace   = var.namespace
+      service_monitor_namespace   = var.create_namespace ? var.namespace : "default"
       metrics_exporter_password   = var.mysqldb_custom_credentials_enabled ? var.mysqldb_custom_credentials_config.exporter_password : var.metric_exporter_pasword,
       secondary_pod_replica_count = var.mysqldb_config.secondary_db_replica_count
     }),
@@ -40,18 +41,18 @@ resource "helm_release" "mysqldb_backup" {
   name       = "mysqldb-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", {
-      bucket_uri           = var.mysqldb_backup_config.bucket_uri,
-      s3_bucket_region     = var.bucket_provider_type == "s3" ? var.mysqldb_backup_config.s3_bucket_region : "",
-      cron_for_full_backup = var.mysqldb_backup_config.cron_for_full_backup,
-      custom_user_username = "root",
-      bucket_provider_type = var.bucket_provider_type,
+      bucket_uri                 = var.mysqldb_backup_config.bucket_uri,
+      s3_bucket_region           = var.bucket_provider_type == "s3" ? var.mysqldb_backup_config.s3_bucket_region : "",
+      cron_for_full_backup       = var.mysqldb_backup_config.cron_for_full_backup,
+      custom_user_username       = "root",
+      bucket_provider_type       = var.bucket_provider_type,
       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}" : "iam.gke.io/gcp-service-account: ${var.service_account_backup}"
+      annotations                = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${var.iam_role_arn_backup}" : "iam.gke.io/gcp-service-account: ${var.service_account_backup}"
     })
   ]
 }
@@ -64,18 +65,18 @@ resource "helm_release" "mysqldb_restore" {
   name       = "mysqldb-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", {
-      bucket_uri           = var.mysqldb_restore_config.bucket_uri,
-      file_name            = var.mysqldb_restore_config.file_name,
-      s3_bucket_region     = var.bucket_provider_type == "s3" ? var.mysqldb_restore_config.s3_bucket_region : "",
-      custom_user_username = "root",
-      bucket_provider_type = var.bucket_provider_type,
+      bucket_uri                 = var.mysqldb_restore_config.bucket_uri,
+      file_name                  = var.mysqldb_restore_config.file_name,
+      s3_bucket_region           = var.bucket_provider_type == "s3" ? var.mysqldb_restore_config.s3_bucket_region : "",
+      custom_user_username       = "root",
+      bucket_provider_type       = var.bucket_provider_type,
       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_restore}" : "iam.gke.io/gcp-service-account: ${var.service_account_restore}"
+      annotations                = var.bucket_provider_type == "s3" ? "eks.amazonaws.com/role-arn: ${var.iam_role_arn_restore}" : "iam.gke.io/gcp-service-account: ${var.service_account_restore}"
     })
   ]
 }
diff --git a/modules/backup/templates/service_account.yaml b/modules/backup/templates/service_account.yaml
@@ -2,6 +2,6 @@ apiVersion: v1
 kind: ServiceAccount
 metadata:
   name: sa-mysql-backup
-  namespace: mysqldb
+  namespace: {{ .Release.Namespace }}
   annotations:
     {{ toYaml .Values.annotations  | indent 4 }}
diff --git a/output.tf b/output.tf
@@ -2,10 +2,10 @@ output "mysqldb_endpoints" {
   description = "MySQL endpoints in the Kubernetes cluster."
   value = {
     mysqlport                         = "3306",
-    mysql_primary_endpoint            = "mysqldb-primary.${var.namespace}.svc.cluster.local",
-    mysql_primary_headless_endpoint   = "mysqldb-primary-headless.${var.namespace}.svc.cluster.local",
-    mysql_secondary_endpoint          = "mysqldb-secondary.${var.namespace}.svc.cluster.local",
-    mysql_secondary_headless_endpoint = "mysqldb-secondary-headless.${var.namespace}.svc.cluster.local",
+    mysql_primary_endpoint            = var.create_namespace ? "mysqldb-primary.${var.namespace}.svc.cluster.local" : "mysqldb-primary.default.svc.cluster.local",
+    mysql_primary_headless_endpoint   = var.create_namespace ? "mysqldb-primary-headless.${var.namespace}.svc.cluster.local" : "mysqldb-primary-headless.default.svc.cluster.local",
+    mysql_secondary_endpoint          = var.create_namespace ? "mysqldb-secondary.${var.namespace}.svc.cluster.local" : "mysqldb-secondary.default.svc.cluster.local",
+    mysql_secondary_headless_endpoint = var.create_namespace ? "mysqldb-secondary-headless.${var.namespace}.svc.cluster.local" : "mysqldb-secondary-headless.default.svc.cluster.local",
   }
 }
 
diff --git a/variables.tf b/variables.tf
@@ -5,6 +5,7 @@ variable "mysqldb_config" {
     environment                      = ""
     values_yaml                      = ""
     architecture                     = ""
+    custom_database                  = ""
     storage_class_name               = ""
     custom_user_username             = ""
     primary_db_volume_size           = ""

Original file line number	Diff line number	Diff line change
`@@ -2,10 +2,10 @@ output "mysqldb_endpoints" {`
`2`	`2`	`description = "MySQL endpoints in the Kubernetes cluster."`
`3`	`3`	`value = {`
`4`	`4`	`mysqlport = "3306",`
`5`		`- mysql_primary_endpoint = "mysqldb-primary.${var.namespace}.svc.cluster.local",`
`6`		`- mysql_primary_headless_endpoint = "mysqldb-primary-headless.${var.namespace}.svc.cluster.local",`
`7`		`- mysql_secondary_endpoint = "mysqldb-secondary.${var.namespace}.svc.cluster.local",`
`8`		`- mysql_secondary_headless_endpoint = "mysqldb-secondary-headless.${var.namespace}.svc.cluster.local",`
	`5`	`+ mysql_primary_endpoint = var.create_namespace ? "mysqldb-primary.${var.namespace}.svc.cluster.local" : "mysqldb-primary.default.svc.cluster.local",`
	`6`	`+ mysql_primary_headless_endpoint = var.create_namespace ? "mysqldb-primary-headless.${var.namespace}.svc.cluster.local" : "mysqldb-primary-headless.default.svc.cluster.local",`
	`7`	`+ mysql_secondary_endpoint = var.create_namespace ? "mysqldb-secondary.${var.namespace}.svc.cluster.local" : "mysqldb-secondary.default.svc.cluster.local",`
	`8`	`+ mysql_secondary_headless_endpoint = var.create_namespace ? "mysqldb-secondary-headless.${var.namespace}.svc.cluster.local" : "mysqldb-secondary-headless.default.svc.cluster.local",`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`