Merge pull request #38 from Snowflake-Labs/eks-node-option

Add customize node min, max and desired option.
Snowflake-Labs · Nov 14, 2024 · 09db1bd · 09db1bd
2 parents 5161884 + dc10c67
commit 09db1bd
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 3 deletions.
diff --git a/eks.tf b/eks.tf
@@ -34,9 +34,9 @@ module "eks" {
 
   eks_managed_node_groups = {
     node-group-1 = {
-      min_size     = 3
-      max_size     = 5
-      desired_size = 3
+      min_size     = var.eks_managed_node_groups_options.min_size
+      max_size     = var.eks_managed_node_groups_options.max_size
+      desired_size = var.eks_managed_node_groups_options.desired_size
 
       instance_types = var.node_group_instance_sizes
       capacity_type  = "ON_DEMAND"

diff --git a/templates/external_dns_private_values.yaml b/templates/external_dns_private_values.yaml
@@ -19,6 +19,7 @@ zoneIdFilters: ["${aws_private_hosted_zone}"]
 annotationFilter: "alb.ingress.kubernetes.io/scheme=internal"
 txtOwnerId: ${eks_cluster_id}
 
+%{ if anytrue([image_registry != null, image_repository != null, image_tag != null]) ~}
 image:
 %{ if image_registry != null ~}
   registry: ${image_registry}
@@ -29,3 +30,4 @@ image:
 %{ if image_tag != null ~}
   tag: ${image_tag}
 %{ endif ~}
+%{ endif ~}
diff --git a/templates/external_dns_values.yaml b/templates/external_dns_values.yaml
@@ -19,6 +19,7 @@ zoneIdFilters: ["${aws_public_hosted_zone}"]
 annotationFilter: "alb.ingress.kubernetes.io/scheme=internet-facing"
 txtOwnerId: ${eks_cluster_id}
 
+%{ if anytrue([image_registry != null, image_repository != null, image_tag != null]) ~}
 image:
 %{ if image_registry != null ~}
   registry: ${image_registry}
@@ -29,3 +30,4 @@ image:
 %{ if image_tag != null ~}
   tag: ${image_tag}
 %{ endif ~}
+%{ endif ~}
diff --git a/variables.tf b/variables.tf
@@ -92,6 +92,20 @@ variable "eks_aws_auth_configmap_users" {
   default     = []
 }
 
+variable "eks_managed_node_groups_options" {
+  description = "An object variable containing key-value pairs for the eks_managed_node_groups parameters."
+  type = object({
+    min_size     = number
+    max_size     = number
+    desired_size = number
+  })
+  default = {
+    min_size     = 3
+    max_size     = 5
+    desired_size = 3
+  }
+}
+
 variable "create_logs_bucket" {
   description = "Flag to create an S3 bucket or not."
   type        = bool