added app version, namespace enable/disable param

Author: Ad-squareops

examples/complete/aws/main.tf

@@ -7,8 +7,10 @@ locals {
     Expires    = "Never"
     Department = "Engineering"
   }
-  store_password_to_secret_manager = true
-  custom_credentials_enabled = true
+  create_namespace                 = false
+  namespace                        = ""
+  store_password_to_secret_manager = false
+  custom_credentials_enabled       = true
   custom_credentials_config = {
     password = "aajdhgduy3873683dh"
   }
@@ -24,21 +26,24 @@ module "aws" {
 }
 
 module "redis" {
-  source = "squareops/redis/kubernetes"
+  source           = "squareops/redis/kubernetes"
+  create_namespace = local.create_namespace
+  namespace        = local.namespace
   redis_config = {
     name                             = local.name
     values_yaml                      = file("./helm/values.yaml")
     environment                      = local.environment
+    app_version                      = "6.2.7-debian-11-r11"
     architecture                     = "replication"
     slave_volume_size                = "10Gi"
     master_volume_size               = "10Gi"
-    storage_class_name               = "gp3"
+    storage_class_name               = "gp2"
     slave_replica_count              = 2
     store_password_to_secret_manager = local.store_password_to_secret_manager
     secret_provider_type             = "aws"
   }
   grafana_monitoring_enabled = true
   custom_credentials_enabled = local.custom_credentials_enabled
-  custom_credentials_config = local.custom_credentials_config
-  redis_password = local.custom_credentials_enabled ? "" : module.aws.redis_password
+  custom_credentials_config  = local.custom_credentials_config
+  redis_password             = local.custom_credentials_enabled ? "" : module.aws.redis_password
 }

examples/complete/azure/main.tf

@@ -7,6 +7,8 @@ locals {
     Expires    = "Never"
     Department = "Engineering"
   }
+  create_namespace                 = false
+  namespace                        = ""
   store_password_to_secret_manager = true
   custom_credentials_enabled       = true
   custom_credentials_config = {
@@ -26,11 +28,14 @@ module "azure" {
 }
 
 module "redis" {
-  source = "squareops/redis/kubernetes"
+  source           = "squareops/redis/kubernetes"
+  create_namespace = local.create_namespace
+  namespace        = local.namespace
   redis_config = {
     name                             = local.name
     values_yaml                      = file("./helm/values.yaml")
     environment                      = local.environment
+    app_version                      = "6.2.7-debian-11-r11"
     architecture                     = "replication"
     slave_volume_size                = "10Gi"
     master_volume_size               = "10Gi"

examples/complete/gcp/main.tf

@@ -7,6 +7,8 @@ locals {
     Expires    = "Never"
     Department = "Engineering"
   }
+  create_namespace                 = false
+  namespace                        = ""
   store_password_to_secret_manager = true
   custom_credentials_enabled = true
   custom_credentials_config = {
@@ -25,11 +27,14 @@ module "gcp" {
 }
 
 module "redis" {
-  source = "squareops/redis/kubernetes"
+  source           = "squareops/redis/kubernetes"
+  create_namespace = local.create_namespace
+  namespace        = local.namespace
   redis_config = {
     name                             = local.name
     values_yaml                      = file("./helm/values.yaml")
     environment                      = local.environment
+    app_version                      = "6.2.7-debian-11-r11"
     architecture                     = "replication"
     slave_volume_size                = "10Gi"
     master_volume_size               = "10Gi"

helm/values/values.yaml

@@ -1459,7 +1459,7 @@ metrics:
     enabled: true
     ## @param metrics.serviceMonitor.namespace The namespace in which the ServiceMonitor will be created
     ##
-    namespace: ""
+    namespace: "${service_monitor_namespace}"
     ## @param metrics.serviceMonitor.interval The interval at which metrics should be scraped
     ##
     interval: 30s

main.tf

@@ -12,18 +12,19 @@ resource "helm_release" "redis" {
   chart      = "redis"
   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/values.yaml", {
-      app_version              = var.app_version,
-      architecture             = var.redis_config.architecture,
-      redis_password           = var.custom_credentials_enabled ? var.custom_credentials_config.password : var.redis_password,
-      slave_volume_size        = var.redis_config.slave_volume_size,
-      slave_replicacount       = var.redis_config.slave_replica_count,
-      storage_class_name       = var.redis_config.storage_class_name,
-      redis_exporter_enabled   = var.grafana_monitoring_enabled,
-      redis_master_volume_size = var.redis_config.master_volume_size
+      app_version               = var.redis_config.app_version,
+      architecture              = var.redis_config.architecture,
+      redis_password            = var.custom_credentials_enabled ? var.custom_credentials_config.password : var.redis_password,
+      slave_volume_size         = var.redis_config.slave_volume_size,
+      slave_replicacount        = var.redis_config.slave_replica_count,
+      storage_class_name        = var.redis_config.storage_class_name,
+      redis_exporter_enabled    = var.grafana_monitoring_enabled,
+      redis_master_volume_size  = var.redis_config.master_volume_size
+      service_monitor_namespace = var.create_namespace ? var.namespace : "default"
     }),
     var.redis_config.values_yaml
   ]

output.tf

@@ -2,8 +2,8 @@ output "redis_endpoints" {
   description = "Redis endpoints in the Kubernetes cluster."
   value = {
     redis_port            = "6379",
-    redis_master_endpoint = "redis-master.${var.namespace}.svc.cluster.local",
-    redis_slave_endpoint  = "redis-replicas.${var.namespace}.svc.cluster.local"
+    redis_master_endpoint = var.create_namespace ? "redis-master.${var.namespace}.svc.cluster.local" : "redis-master.default.svc.cluster.local",
+    redis_slave_endpoint  = var.create_namespace ? "redis-replicas.${var.namespace}.svc.cluster.local" : "redis-replicas.default.svc.cluster.local"
   }
 }
 

variables.tf

@@ -5,6 +5,7 @@ variable "redis_config" {
     environment                      = ""
     master_volume_size               = ""
     architecture                     = "replication"
+    app_version                      = "6.2.7-debian-11-r11"
     slave_replica_count              = 1
     slave_volume_size                = ""
     storage_class_name               = ""
@@ -20,12 +21,6 @@ variable "chart_version" {
   description = "Version of the chart for the Redis application that will be deployed."
 }
 
-variable "app_version" {
-  type        = string
-  default     = "6.2.7-debian-11-r11"
-  description = "Version of the Redis application that will be deployed."
-}
-
 variable "namespace" {
   type        = string
   default     = "redis"