enable_cross_zone_load_balancing and preserve_client_ip

Author: alex-hunt-materialize

main.tf

@@ -138,12 +138,13 @@ module "nlb" {
 
   for_each = { for idx, instance in local.instances : instance.name => instance if lookup(instance, "create_nlb", true) }
 
-  name_prefix    = each.value.name
-  namespace      = each.value.namespace
-  internal       = each.value.internal_nlb
-  subnet_ids     = each.value.internal_nlb ? local.network_private_subnet_ids : local.network_public_subnet_ids
-  vpc_id         = local.network_id
-  mz_resource_id = module.operator[0].materialize_instance_resource_ids[each.value.name]
+  name_prefix                      = each.value.name
+  namespace                        = each.value.namespace
+  internal                         = each.value.internal_nlb
+  subnet_ids                       = each.value.internal_nlb ? local.network_private_subnet_ids : local.network_public_subnet_ids
+  enable_cross_zone_load_balancing = each.value.enable_cross_zone_load_balancing
+  vpc_id                           = local.network_id
+  mz_resource_id                   = module.operator[0].materialize_instance_resource_ids[each.value.name]
 
   depends_on = [
     module.aws_lbc,
@@ -189,13 +190,14 @@ locals {
 
   instances = [
     for instance in var.materialize_instances : {
-      name                 = instance.name
-      namespace            = instance.namespace
-      database_name        = instance.database_name
-      create_database      = instance.create_database
-      environmentd_version = instance.environmentd_version
-      create_nlb           = instance.create_nlb
-      internal_nlb         = instance.internal_nlb
+      name                             = instance.name
+      namespace                        = instance.namespace
+      database_name                    = instance.database_name
+      create_database                  = instance.create_database
+      environmentd_version             = instance.environmentd_version
+      create_nlb                       = instance.create_nlb
+      internal_nlb                     = instance.internal_nlb
+      enable_cross_zone_load_balancing = instance.enable_cross_zone_load_balancing
 
       metadata_backend_url = format(
         "postgres://%s:%s@%s/%s?sslmode=require",

modules/nlb/main.tf

@@ -1,8 +1,9 @@
 resource "aws_lb" "nlb" {
-  name               = var.name_prefix
-  internal           = var.internal
-  load_balancer_type = "network"
-  subnets            = var.subnet_ids
+  name                             = var.name_prefix
+  internal                         = var.internal
+  load_balancer_type               = "network"
+  subnets                          = var.subnet_ids
+  enable_cross_zone_load_balancing = var.enable_cross_zone_load_balancing
 }
 
 module "target_pgwire" {

modules/nlb/target/main.tf

@@ -1,9 +1,10 @@
 resource "aws_lb_target_group" "target_group" {
-  name        = var.name
-  port        = var.port
-  protocol    = "TCP"
-  target_type = "ip"
-  vpc_id      = var.vpc_id
+  name               = var.name
+  port               = var.port
+  preserve_client_ip = true
+  protocol           = "TCP"
+  target_type        = "ip"
+  vpc_id             = var.vpc_id
 
   health_check {
     enabled             = true

modules/nlb/variables.tf

@@ -28,3 +28,9 @@ variable "mz_resource_id" {
   description = "The resourceId from the Materialize CR"
   type        = string
 }
+
+variable "enable_cross_zone_load_balancing" {
+  description = "Whether to enable cross zone load balancing on the NLB."
+  type        = bool
+  default     = true
+}

variables.tf

@@ -319,22 +319,23 @@ variable "helm_values" {
 variable "materialize_instances" {
   description = "Configuration for Materialize instances"
   type = list(object({
-    name                    = string
-    namespace               = optional(string)
-    database_name           = string
-    environmentd_version    = optional(string, "v0.130.4")
-    cpu_request             = optional(string, "1")
-    memory_request          = optional(string, "1Gi")
-    memory_limit            = optional(string, "1Gi")
-    create_database         = optional(bool, true)
-    create_nlb              = optional(bool, true)
-    internal_nlb            = optional(bool, true)
-    in_place_rollout        = optional(bool, false)
-    request_rollout         = optional(string)
-    force_rollout           = optional(string)
-    balancer_memory_request = optional(string, "256Mi")
-    balancer_memory_limit   = optional(string, "256Mi")
-    balancer_cpu_request    = optional(string, "100m")
+    name                             = string
+    namespace                        = optional(string)
+    database_name                    = string
+    environmentd_version             = optional(string, "v0.130.4")
+    cpu_request                      = optional(string, "1")
+    memory_request                   = optional(string, "1Gi")
+    memory_limit                     = optional(string, "1Gi")
+    create_database                  = optional(bool, true)
+    create_nlb                       = optional(bool, true)
+    internal_nlb                     = optional(bool, true)
+    enable_cross_zone_load_balancing = optional(bool, true)
+    in_place_rollout                 = optional(bool, false)
+    request_rollout                  = optional(string)
+    force_rollout                    = optional(string)
+    balancer_memory_request          = optional(string, "256Mi")
+    balancer_memory_limit            = optional(string, "256Mi")
+    balancer_cpu_request             = optional(string, "100m")
   }))
   default = []