Merge pull request #1 from RohitSquareops/main

updated release with modified variables and output

Author: sunil-kumar-squareops

IAM.md

@@ -22,9 +22,9 @@ The Policy required to deploy this module:
                 "secretsmanager:CreateSecret",
                 "secretsmanager:DeleteSecret",
                 "secretsmanager:DescribeSecret",
-                "secretsmanager:GetResourcePolicy",
                 "secretsmanager:GetSecretValue",
-                "secretsmanager:PutSecretValue"
+                "secretsmanager:PutSecretValue",
+                "secretsmanager:GetResourcePolicy"
             ],
             "Resource": [
                 "*"

README.md

@@ -12,18 +12,18 @@
 ```hcl
 module "redis" {
   source                     = "../../"
-  enable_grafana_monitoring  = true
-  recovery_window_aws_secret = 30
   redis_config = {
-    name                = local.name
-    environment         = local.environment
-    master_volume_size  = "10Gi"
+    name                = "skaf"
+    values_yaml         = ""
+    environment         = "prod"
     architecture        = "replication"
-    slave_replica_count = 3
-    slave_volume_size   = "10Gi"
     storage_class_name  = "gp2"
-    values_yaml         = ""
+    slave_volume_size   = "10Gi"
+    slave_replica_count = 3
+    master_volume_size  = "10Gi"  
   }
+  grafana_monitoring_enabled  = true
+  recovery_window_aws_secret = 0
 }
 
 ```
@@ -75,7 +75,8 @@ No modules.
 |------|-------------|------|---------|:--------:|
 | <a name="input_app_version"></a> [app\_version](#input\_app\_version) | Enter app version of application | `string` | `"6.2.7-debian-11-r11"` | no |
 | <a name="input_chart_version"></a> [chart\_version](#input\_chart\_version) | Enter chart version of application | `string` | `"16.13.2"` | no |
-| <a name="input_enable_grafana_monitoring"></a> [enable\_grafana\_monitoring](#input\_enable\_grafana\_monitoring) | Set true to deploy redis exporter to get metrics in grafana | `bool` | `false` | no |
+| <a name="input_create_namespace"></a> [create\_namespace](#input\_create\_namespace) | Set it to true to create given namespace | `string` | `true` | no |
+| <a name="input_grafana_monitoring_enabled"></a> [grafana\_monitoring\_enabled](#input\_grafana\_monitoring\_enabled) | Set true to deploy redis exporter to get metrics in grafana | `bool` | `false` | no |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Enter namespace name | `string` | `"redis"` | no |
 | <a name="input_recovery_window_aws_secret"></a> [recovery\_window\_aws\_secret](#input\_recovery\_window\_aws\_secret) | Number of days that AWS Secrets Manager waits before it can delete the secret. This value can be 0 to force deletion without recovery or range from 7 to 30 days. | `number` | `0` | no |
 | <a name="input_redis_config"></a> [redis\_config](#input\_redis\_config) | Redis configurations | `any` | <pre>{<br>  "architecture": "replication",<br>  "environment": "",<br>  "master_volume_size": "",<br>  "name": "",<br>  "slave_replica_count": 1,<br>  "slave_volume_size": "",<br>  "storage_class_name": "",<br>  "values_yaml": ""<br>}</pre> | no |

examples/complete/main.tf

@@ -5,17 +5,17 @@ locals {
 }
 
 module "redis" {
-  source                     = "../../"
-  enable_grafana_monitoring  = true
-  recovery_window_aws_secret = 30
+  source = "../../"
   redis_config = {
     name                = local.name
+    values_yaml         = file("./helm/values.yaml")
     environment         = local.environment
-    master_volume_size  = "10Gi"
     architecture        = "replication"
-    slave_replica_count = 3
     slave_volume_size   = "10Gi"
+    master_volume_size  = "10Gi"
     storage_class_name  = "gp2"
-    values_yaml         = file("./helm/values.yaml")
+    slave_replica_count = 2
   }
+  grafana_monitoring_enabled = true
+  recovery_window_aws_secret = 0
 }

examples/complete/provider.tf

@@ -4,11 +4,11 @@ provider "aws" {
 
 
 data "aws_eks_cluster" "cluster" {
-  name = "stg-msa"
+  name = ""
 }
 
 data "aws_eks_cluster_auth" "cluster" {
-  name = "stg-msa"
+  name = ""
 }
 
 

helm/values/values.yaml

@@ -174,7 +174,8 @@ master:
   ##  - "--maxmemory-policy volatile-ttl"
   ##  - "--repl-backlog-size 1024mb"
   ##
-  extraFlags: []
+  extraFlags: 
+    - "--maxmemory 1024mb"
   ## @param master.extraEnvVars Array with extra environment variables to add to Redis® master nodes
   ## e.g:
   ## extraEnvVars:
@@ -546,7 +547,8 @@ replica:
   ##  - "--maxmemory-policy volatile-ttl"
   ##  - "--repl-backlog-size 1024mb"
   ##
-  extraFlags: []
+  extraFlags: 
+    - "--maxmemory 1024mb"
   ## @param replica.extraEnvVars Array with extra environment variables to add to Redis® replicas nodes
   ## e.g:
   ## extraEnvVars:

main.tf

@@ -22,30 +22,28 @@ resource "kubernetes_namespace" "redis" {
   count = var.create_namespace ? 1 : 0
   metadata {
     annotations = {}
-
-    name = var.namespace
+    name        = var.namespace
   }
 }
 
 resource "helm_release" "redis" {
   depends_on = [kubernetes_namespace.redis]
   name       = "redis"
-  repository = "https://charts.bitnami.com/bitnami"
   chart      = "redis"
-  namespace  = var.namespace
   version    = var.chart_version
   timeout    = 600
-
+  namespace  = var.namespace
+  repository = "https://charts.bitnami.com/bitnami"
   values = [
     templatefile("${path.module}/helm/values/values.yaml", {
       app_version              = var.app_version,
-      redis_password           = random_password.redis_password.result,
-      redis_master_volume_size = var.redis_config.master_volume_size,
       architecture             = var.redis_config.architecture,
-      slave_replicacount       = var.redis_config.slave_replica_count,
+      redis_password           = random_password.redis_password.result,
       slave_volume_size        = var.redis_config.slave_volume_size,
-      redis_exporter_enabled   = var.enable_grafana_monitoring,
-      storage_class_name       = var.redis_config.storage_class_name
+      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
     }),
     var.redis_config.values_yaml
   ]

variables.tf

@@ -31,7 +31,7 @@ variable "namespace" {
   description = "Enter namespace name"
 }
 
-variable "enable_grafana_monitoring" {
+variable "grafana_monitoring_enabled" {
   type        = bool
   default     = false
   description = "Set true to deploy redis exporter to get metrics in grafana"
@@ -44,7 +44,7 @@ variable "recovery_window_aws_secret" {
 }
 
 variable "create_namespace" {
-  type = string
+  type        = string
   description = "Set it to true to create given namespace"
-  default = true
+  default     = true
 }