kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Default CrossZoneLoadBalancing to false if not set

This commit is contained in:
Austin Moore 2019-05-20 17:22:38 -04:00
parent c18f30a400
commit 4485b115f4
No known key found for this signature in database
GPG Key ID: 00C3CB911B80D7DC
13 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/model/awsmodel/api_loadbalancer.go
View File

@ -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 {

3
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/complex/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/existing_sg/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/private-shared-subnet/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/privatecalico/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/privatecanal/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/privatedns1/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/privatedns2/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/privateflannel/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/privatekopeio/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/privateweave/kubernetes.tf
View File

@ -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"

3
tests/integration/update_cluster/unmanaged/kubernetes.tf
View File

@ -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"