updated to vars for Aurora Serverless V2

cloudacademy · Jan 26, 2025 · 7bca592 · 7bca592
1 parent 31dc70d
commit 7bca592
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 10 deletions.
diff --git a/terraform/k8s/archs/arch1/README.md b/terraform/k8s/archs/arch1/README.md
@@ -31,8 +31,12 @@ locals {
     master_username = "root"
     master_password = "followthewhiterabbit"
     db_name         = "cloudacademy"
-    scaling_min     = 2
-    scaling_max     = 4
+    engine          = "aurora-mysql"
+    engine_version  = "8.0.mysql_aurora.3.08.0"
+    acu = {
+      min = 0.5
+      max = 1.0
+    }
   }
 }
 ```

diff --git a/terraform/k8s/archs/arch2/README.md b/terraform/k8s/archs/arch2/README.md
@@ -31,8 +31,12 @@ locals {
     master_username = "root"
     master_password = "followthewhiterabbit"
     db_name         = "cloudacademy"
-    scaling_min     = 2
-    scaling_max     = 4
+    engine          = "aurora-mysql"
+    engine_version  = "8.0.mysql_aurora.3.08.0"
+    acu = {
+      min = 0.5
+      max = 1.0
+    }
   }
 }
 ```

diff --git a/terraform/main.tf b/terraform/main.tf
@@ -52,8 +52,12 @@ locals {
     master_username = "root"
     master_password = "followthewhiterabbit"
     db_name         = "cloudacademy"
-    scaling_min     = 2
-    scaling_max     = 4
+    engine          = "aurora-mysql"
+    engine_version  = "8.0.mysql_aurora.3.08.0"
+    acu = {
+      min = 0.5
+      max = 1.0
+    }
   }
 }
 
@@ -124,7 +128,11 @@ module "aurora" {
   master_username     = local.rds.master_username
   master_password     = local.rds.master_password
   db_name             = local.rds.db_name
+  engine              = local.rds.engine
+  engine_version      = local.rds.engine_version
   secret_manager_arn  = module.secretsmanager.arn
+  acu_min             = local.rds.acu.min
+  acu_max             = local.rds.acu.max
 }
 
 #====================================

diff --git a/terraform/modules/aurora/main.tf b/terraform/modules/aurora/main.tf
@@ -21,8 +21,8 @@ resource "aws_security_group" "allow_mysql_from_private_subnets" {
 
 resource "aws_rds_cluster" "cloudacademy" {
   cluster_identifier   = "cloudacademy"
-  engine               = "aurora-mysql"
-  engine_version       = "8.0.mysql_aurora.3.08.0"
+  engine               = var.engine
+  engine_version       = var.engine_version
   enable_http_endpoint = true
 
   master_username = var.master_username
@@ -35,8 +35,8 @@ resource "aws_rds_cluster" "cloudacademy" {
   vpc_security_group_ids  = [aws_security_group.allow_mysql_from_private_subnets.id]
 
   serverlessv2_scaling_configuration {
-    min_capacity = 0.5 # Min ACU
-    max_capacity = 1.0 # Max ACU
+    min_capacity = var.acu_min
+    max_capacity = var.acu_max
   }
 }
 

diff --git a/terraform/modules/aurora/variables.tf b/terraform/modules/aurora/variables.tf
@@ -22,6 +22,22 @@ variable "db_name" {
   type = string
 }
 
+variable "engine" {
+  type = string
+}
+
+variable "engine_version" {
+  type = string
+}
+
 variable "secret_manager_arn" {
   type = string
 }
+
+variable "acu_min" {
+  type = number
+}
+
+variable "acu_max" {
+  type = number
+}