Merge pull request #21 from comet-ml/druid-node-adjustment

Remove zookeeper and airflow MNGs

Author: burmek

main.tf

@@ -80,10 +80,6 @@ module "comet_eks" {
 
   eks_druid_instance_type     = var.eks_druid_instance_type
   eks_druid_node_count        = var.eks_druid_node_count
-  eks_zookeeper_instance_type = var.eks_zookeeper_instance_type
-  eks_zookeeper_node_count    = var.eks_zookeeper_node_count
-  eks_airflow_instance_type   = var.eks_airflow_instance_type
-  eks_airflow_node_count      = var.eks_airflow_node_count
 }
 
 module "comet_elasticache" {

modules/comet_eks/main.tf

@@ -72,50 +72,6 @@ module "eks" {
           nodegroup_name = "druid"
         }
         iam_role_additional_policies = var.s3_enabled ? { comet_s3_access = var.comet_ec2_s3_iam_policy } : {}
-      },
-      zookeeper = {
-        name           = "zookeeper"
-        instance_types = [var.eks_zookeeper_instance_type]
-        min_size       = var.eks_zookeeper_node_count
-        max_size       = var.eks_zookeeper_node_count
-        desired_size   = var.eks_zookeeper_node_count
-        block_device_mappings = {
-          xvda = {
-            device_name = "/dev/xvda"
-            ebs = {
-              volume_size           = var.eks_mng_disk_size
-              volume_type           = local.volume_type
-              encrypted             = local.volume_encrypted
-              delete_on_termination = local.volume_delete_on_termination
-            }
-          }
-        }
-        labels = {
-          nodegroup_name = "zookeeper"
-        }
-        iam_role_additional_policies = var.s3_enabled ? { comet_s3_access = var.comet_ec2_s3_iam_policy } : {}
-      },
-      airflow = {
-        name           = "airflow"
-        instance_types = [var.eks_airflow_instance_type]
-        min_size       = var.eks_airflow_node_count
-        max_size       = var.eks_airflow_node_count
-        desired_size   = var.eks_airflow_node_count
-        block_device_mappings = {
-          xvda = {
-            device_name = "/dev/xvda"
-            ebs = {
-              volume_size           = var.eks_mng_disk_size
-              volume_type           = local.volume_type
-              encrypted             = local.volume_encrypted
-              delete_on_termination = local.volume_delete_on_termination
-            }
-          }
-        }
-        labels = {
-          nodegroup_name = "airflow"
-        }
-        iam_role_additional_policies = var.s3_enabled ? { comet_s3_access = var.comet_ec2_s3_iam_policy } : {}
       }
     } : {}
   )

modules/comet_eks/variables.tf

@@ -100,27 +100,7 @@ variable "eks_druid_instance_type" {
   type        = string
 }
 
-variable "eks_zookeeper_instance_type" {
-  description = "Instance type for EKS Zookeeper nodes"
-  type        = string
-}
-
-variable "eks_airflow_instance_type" {
-  description = "Instance type for EKS Airflow nodes"
-  type        = string
-}
-
 variable "eks_druid_node_count" {
   description = "Instance count for EKS Druid nodes"
   type        = number
-}
-
-variable "eks_zookeeper_node_count" {
-  description = "Instance count for EKS Zookeeper nodes"
-  type        = number
-}
-
-variable "eks_airflow_node_count" {
-  description = "Instance count for EKS Airflow nodes"
-  type        = number
 }

variables.tf

@@ -221,37 +221,13 @@ variable "eks_external_dns_r53_zones" {
 variable "eks_druid_instance_type" {
   description = "Instance type for EKS Druid nodes"
   type        = string
-  default     = "m6i.4xlarge"
-}
-
-variable "eks_zookeeper_instance_type" {
-  description = "Instance type for EKS Zookeeper nodes"
-  type        = string
-  default     = "m6i.4xlarge"
-}
-
-variable "eks_airflow_instance_type" {
-  description = "Instance type for EKS Airflow nodes"
-  type        = string
-  default     = "m6i.4xlarge"
+  default     = "m7i.2xlarge"
 }
 
 variable "eks_druid_node_count" {
   description = "Instance count for EKS Druid nodes"
   type        = number
-  default     = 6
-}
-
-variable "eks_zookeeper_node_count" {
-  description = "Instance count for EKS Zookeeper nodes"
-  type        = number
-  default     = 3
-}
-
-variable "eks_airflow_node_count" {
-  description = "Instance count for EKS Airflow nodes"
-  type        = number
-  default     = 3
+  default     = 4
 }
 
 #### comet_elasticache ####