Merge pull request #19 from datafold/saas-k8s-followup

fix: Adds variables to set EBS volume attributes separately.

Author: gtoonstra

main.tf

@@ -216,8 +216,8 @@ resource "aws_ebs_volume" "clickhouse_data" {
   size              = var.clickhouse_data_size
   encrypted         = true
   type              = var.ebs_type
-  iops              = var.ebs_type != "gp2" ? var.ebs_iops : null
-  throughput        = var.ebs_type != "gp2" ? var.ebs_throughput : null
+  iops              = var.ebs_type != "gp2" ? var.ch_data_ebs_iops : null
+  throughput        = var.ebs_type != "gp2" ? var.ch_data_ebs_throughput : null
 
   tags = merge({
     Name = "${var.deployment_name}-clickhouse-data"
@@ -229,8 +229,8 @@ resource "aws_ebs_volume" "clickhouse_logs" {
   size              = var.clickhouse_logs_size
   encrypted         = true
   type              = var.ebs_type
-  iops              = var.ebs_type != "gp2" ? var.ebs_iops : null
-  throughput        = var.ebs_type != "gp2" ? var.ebs_throughput : null
+  iops              = var.ebs_type != "gp2" ? var.ch_logs_ebs_iops : null
+  throughput        = var.ebs_type != "gp2" ? var.ch_logs_ebs_throughput : null
 
   tags = {
     Name = "${var.deployment_name}-clickhouse-logs"
@@ -242,8 +242,8 @@ resource "aws_ebs_volume" "redis_data" {
   size              = var.redis_data_size
   encrypted         = true
   type              = var.ebs_type
-  iops              = var.ebs_type != "gp2" ? var.ebs_iops : null
-  throughput        = var.ebs_type != "gp2" ? var.ebs_throughput : null
+  iops              = var.ebs_type != "gp2" ? var.redis_ebs_iops : null
+  throughput        = var.ebs_type != "gp2" ? var.redis_ebs_throughput : null
 
   tags = {
     Name = "${var.deployment_name}-redis-data"

variables.tf

@@ -586,27 +586,55 @@ variable "clickhouse_logs_size" {
 variable "ebs_type" {
   type        = string
   default     = "gp3"
-  description = "Type of EBS volume"
+  description = "Type for all EBS volumes"
 }
 
-variable "ebs_iops" {
+variable "ch_data_ebs_iops" {
   type        = number
   default     = 3000
   description = "IOPS of EBS volume"
 }
 
-variable "ebs_throughput" {
+variable "ch_data_ebs_throughput" {
   type        = number
   default     = 1000
   description = "Throughput of EBS volume"
 }
 
+variable "ch_logs_ebs_iops" {
+  type        = number
+  default     = 3000
+  description = "IOPS of EBS volume"
+}
+
+variable "ch_logs_ebs_throughput" {
+  type        = number
+  default     = 250
+  description = "Throughput of EBS volume"
+}
+
 variable "s3_backup_bucket_name_override" {
   type        = string
   default     = ""
   description = "Bucket name override."
 }
 
+# ┏━┓┏━╸╺┳┓╻┏━┓
+# ┣┳┛┣╸  ┃┃┃┗━┓
+# ╹┗╸┗━╸╺┻┛╹┗━┛
+
+variable "redis_ebs_iops" {
+  type        = number
+  default     = 3000
+  description = "IOPS of EBS redis volume"
+}
+
+variable "redis_ebs_throughput" {
+  type        = number
+  default     = 125
+  description = "Throughput of EBS redis volume"
+}
+
 # ┏━╸╻┏ ┏━┓
 # ┣╸ ┣┻┓┗━┓
 # ┗━╸╹ ╹┗━┛