From 4485b115f4531e4d780bce59929dd3fa696b0f61 Mon Sep 17 00:00:00 2001 From: Austin Moore Date: Mon, 20 May 2019 17:22:38 -0400 Subject: [PATCH] Default CrossZoneLoadBalancing to false if not set --- pkg/model/awsmodel/api_loadbalancer.go | 11 ++++++----- .../bastionadditional_user-data/kubernetes.tf | 3 ++- .../integration/update_cluster/complex/kubernetes.tf | 3 ++- .../update_cluster/existing_sg/kubernetes.tf | 3 ++- .../private-shared-subnet/kubernetes.tf | 3 ++- .../update_cluster/privatecalico/kubernetes.tf | 3 ++- .../update_cluster/privatecanal/kubernetes.tf | 3 ++- .../update_cluster/privatedns1/kubernetes.tf | 3 ++- .../update_cluster/privatedns2/kubernetes.tf | 3 ++- .../update_cluster/privateflannel/kubernetes.tf | 3 ++- .../update_cluster/privatekopeio/kubernetes.tf | 3 ++- .../update_cluster/privateweave/kubernetes.tf | 3 ++- .../update_cluster/unmanaged/kubernetes.tf | 3 ++- 13 files changed, 30 insertions(+), 17 deletions(-) diff --git a/pkg/model/awsmodel/api_loadbalancer.go b/pkg/model/awsmodel/api_loadbalancer.go index 8269d38d8b..9f41890779 100644 --- a/pkg/model/awsmodel/api_loadbalancer.go +++ b/pkg/model/awsmodel/api_loadbalancer.go @@ -153,11 +153,12 @@ func (b *APILoadBalancerBuilder) Build(c *fi.ModelBuilderContext) error { Tags: tags, } - // Only set if specified so we don't change existing logic - if lbSpec.CrossZoneLoadBalancing != nil { - elb.CrossZoneLoadBalancing = &awstasks.LoadBalancerCrossZoneLoadBalancing{ - Enabled: lbSpec.CrossZoneLoadBalancing, - } + if lbSpec.CrossZoneLoadBalancing == nil { + lbSpec.CrossZoneLoadBalancing = fi.Bool(false) + } + + elb.CrossZoneLoadBalancing = &awstasks.LoadBalancerCrossZoneLoadBalancing{ + Enabled: lbSpec.CrossZoneLoadBalancing, } switch lbSpec.Type { diff --git a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf index 3c345764f0..8f9dae1c8b 100644 --- a/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf +++ b/tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf @@ -268,7 +268,8 @@ resource "aws_elb" "api-bastionuserdata-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "bastionuserdata.example.com" diff --git a/tests/integration/update_cluster/complex/kubernetes.tf b/tests/integration/update_cluster/complex/kubernetes.tf index 109094c58d..e2cdd34f24 100644 --- a/tests/integration/update_cluster/complex/kubernetes.tf +++ b/tests/integration/update_cluster/complex/kubernetes.tf @@ -223,7 +223,8 @@ resource "aws_elb" "api-complex-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "complex.example.com" diff --git a/tests/integration/update_cluster/existing_sg/kubernetes.tf b/tests/integration/update_cluster/existing_sg/kubernetes.tf index 775d2228bf..14f96c55bf 100644 --- a/tests/integration/update_cluster/existing_sg/kubernetes.tf +++ b/tests/integration/update_cluster/existing_sg/kubernetes.tf @@ -332,7 +332,8 @@ resource "aws_elb" "api-existingsg-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "existingsg.example.com" diff --git a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf index 881ebd0dd7..f943813bd0 100644 --- a/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf +++ b/tests/integration/update_cluster/private-shared-subnet/kubernetes.tf @@ -248,7 +248,8 @@ resource "aws_elb" "api-private-shared-subnet-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "private-shared-subnet.example.com" diff --git a/tests/integration/update_cluster/privatecalico/kubernetes.tf b/tests/integration/update_cluster/privatecalico/kubernetes.tf index 19a65a7f56..c8f014cbdd 100644 --- a/tests/integration/update_cluster/privatecalico/kubernetes.tf +++ b/tests/integration/update_cluster/privatecalico/kubernetes.tf @@ -268,7 +268,8 @@ resource "aws_elb" "api-privatecalico-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "privatecalico.example.com" diff --git a/tests/integration/update_cluster/privatecanal/kubernetes.tf b/tests/integration/update_cluster/privatecanal/kubernetes.tf index fad8363fce..f8f1286312 100644 --- a/tests/integration/update_cluster/privatecanal/kubernetes.tf +++ b/tests/integration/update_cluster/privatecanal/kubernetes.tf @@ -268,7 +268,8 @@ resource "aws_elb" "api-privatecanal-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "privatecanal.example.com" diff --git a/tests/integration/update_cluster/privatedns1/kubernetes.tf b/tests/integration/update_cluster/privatedns1/kubernetes.tf index 1628936fbc..c8cb6ece24 100644 --- a/tests/integration/update_cluster/privatedns1/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns1/kubernetes.tf @@ -268,7 +268,8 @@ resource "aws_elb" "api-privatedns1-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "privatedns1.example.com" diff --git a/tests/integration/update_cluster/privatedns2/kubernetes.tf b/tests/integration/update_cluster/privatedns2/kubernetes.tf index 0efa125010..618e85adfe 100644 --- a/tests/integration/update_cluster/privatedns2/kubernetes.tf +++ b/tests/integration/update_cluster/privatedns2/kubernetes.tf @@ -263,7 +263,8 @@ resource "aws_elb" "api-privatedns2-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "privatedns2.example.com" diff --git a/tests/integration/update_cluster/privateflannel/kubernetes.tf b/tests/integration/update_cluster/privateflannel/kubernetes.tf index 116a1a7032..82a618d4f8 100644 --- a/tests/integration/update_cluster/privateflannel/kubernetes.tf +++ b/tests/integration/update_cluster/privateflannel/kubernetes.tf @@ -268,7 +268,8 @@ resource "aws_elb" "api-privateflannel-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "privateflannel.example.com" diff --git a/tests/integration/update_cluster/privatekopeio/kubernetes.tf b/tests/integration/update_cluster/privatekopeio/kubernetes.tf index c70829d38d..64fc3457a1 100644 --- a/tests/integration/update_cluster/privatekopeio/kubernetes.tf +++ b/tests/integration/update_cluster/privatekopeio/kubernetes.tf @@ -273,7 +273,8 @@ resource "aws_elb" "api-privatekopeio-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "privatekopeio.example.com" diff --git a/tests/integration/update_cluster/privateweave/kubernetes.tf b/tests/integration/update_cluster/privateweave/kubernetes.tf index 3f076cf2ce..2ff8341d03 100644 --- a/tests/integration/update_cluster/privateweave/kubernetes.tf +++ b/tests/integration/update_cluster/privateweave/kubernetes.tf @@ -268,7 +268,8 @@ resource "aws_elb" "api-privateweave-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "privateweave.example.com" diff --git a/tests/integration/update_cluster/unmanaged/kubernetes.tf b/tests/integration/update_cluster/unmanaged/kubernetes.tf index d01e449f3b..92914414f7 100644 --- a/tests/integration/update_cluster/unmanaged/kubernetes.tf +++ b/tests/integration/update_cluster/unmanaged/kubernetes.tf @@ -253,7 +253,8 @@ resource "aws_elb" "api-unmanaged-example-com" { timeout = 5 } - idle_timeout = 300 + cross_zone_load_balancing = false + idle_timeout = 300 tags = { KubernetesCluster = "unmanaged.example.com"