Merge pull request #43 from worldcoin/feat/limit-warm-ip-target-to-4-and-disable-pod-eni

INFRA-5508 & INFRA-5506: Limit `warm_ip_target` to 4 and disable POD ENI

Author: marcin-janas

cluster-addons.tf

@@ -74,14 +74,15 @@ resource "aws_eks_addon" "vpc_cni" {
   resolve_conflicts_on_create = "OVERWRITE"
   resolve_conflicts_on_update = "OVERWRITE"
   configuration_values = jsonencode({
-    env : {
+    env : merge({
       ENABLE_PREFIX_DELEGATION : lower(tostring(var.vpc_cni_enable_prefix_delegation)),                   # Enable prefix delegation for IPv6, allocate IPs in /28 blocks (instead of all at once)
-      WARM_IP_TARGET : var.vpc_cni_warm_ip_target,                                                        # Keep +8 IPs warm for each node to speed up pod scheduling
+      WARM_IP_TARGET : var.vpc_cni_warm_ip_target,                                                        # Keep +4 IPs warm for each node to speed up pod scheduling
       WARM_ENI_TARGET : var.vpc_cni_warm_eni_target,                                                      # Keep +1 ENI warm for each node to speed up pod scheduling
-      ENABLE_POD_ENI : lower(tostring(var.vpc_cni_enable_pod_eni)),                                       # Enable pod ENI support
       POD_SECURITY_GROUP_ENFORCING_MODE : lower(tostring(var.vpc_cni_pod_security_group_enforcing_mode)), # Enable pod security group enforcing mode
       AWS_VPC_K8S_CNI_EXTERNALSNAT : lower(tostring(var.vpc_cni_external_snat)),                          # Enable external SNAT to enable pod to pod communication across different vpc's
-    }
+      }, var.vpc_cni_enable_pod_eni ? {
+      ENABLE_POD_ENI : lower(tostring(var.vpc_cni_enable_pod_eni)), # Enable pod ENI support
+    } : {})
   })
 }
 
@@ -194,8 +195,8 @@ resource "aws_eks_addon" "metrics_server" {
           memory = "200Mi"
         }
         limits = {
-          cpu: "100m"
-          memory: "200Mi"
+          cpu : "100m"
+          memory : "200Mi"
         }
       }
     }

variables.tf

@@ -250,7 +250,7 @@ variable "vpc_cni_enable_prefix_delegation" {
 variable "vpc_cni_warm_ip_target" {
   description = "Number of IPs to keep warm for each node to speed up pod scheduling"
   type        = string
-  default     = "8"
+  default     = "4"
 }
 
 variable "vpc_cni_warm_eni_target" {
@@ -432,7 +432,7 @@ variable "public_access_cidrs" {
   type        = list(string)
   default     = ["0.0.0.0/0"]
   validation {
-    condition = alltrue([for cidr in var.public_access_cidrs : can(cidrnetmask(cidr))])
+    condition     = alltrue([for cidr in var.public_access_cidrs : can(cidrnetmask(cidr))])
     error_message = "All public access CIDRs must be valid CIDR blocks."
   }
 }
@@ -685,7 +685,7 @@ variable "deploy_desired_vs_status_evaluation_period" {
 variable "vpc_cni_enable_pod_eni" {
   description = "Enable pod ENI support"
   type        = bool
-  default     = true
+  default     = false
 }
 
 variable "vpc_cni_pod_security_group_enforcing_mode" {