tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #822 from docker/cross_lb

This commit is contained in:
Nicolas De loof 2020-10-22 15:35:07 +02:00 committed by GitHub
parent 34a7466571 78931b3efa
commit b95c9a987e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ecs/awsResources.go
View File

@ -400,12 +400,24 @@ func (b *ecsAPIService) ensureLoadBalancer(r *awsResources, project *types.Proje
// Network Load Balancers do not have associated security groups // Network Load Balancers do not have associated security groups
securityGroups = r.getLoadBalancerSecurityGroups(project) securityGroups = r.getLoadBalancerSecurityGroups(project)
} }
var loadBalancerAttributes []elasticloadbalancingv2.LoadBalancer_LoadBalancerAttribute
if balancerType == elbv2.LoadBalancerTypeEnumNetwork {
loadBalancerAttributes = append(
loadBalancerAttributes,
elasticloadbalancingv2.LoadBalancer_LoadBalancerAttribute{
Key: "load_balancing.cross_zone.enabled",
Value: "true",
})
}
template.Resources["LoadBalancer"] = &elasticloadbalancingv2.LoadBalancer{ template.Resources["LoadBalancer"] = &elasticloadbalancingv2.LoadBalancer{
Scheme: elbv2.LoadBalancerSchemeEnumInternetFacing, Scheme: elbv2.LoadBalancerSchemeEnumInternetFacing,
SecurityGroups: securityGroups, SecurityGroups: securityGroups,
Subnets: r.subnetsIDs(), Subnets: r.subnetsIDs(),
Tags: projectTags(project), Tags: projectTags(project),
Type: balancerType, Type: balancerType,
LoadBalancerAttributes: loadBalancerAttributes,
} }
r.loadBalancer = cloudformationARNResource{ r.loadBalancer = cloudformationARNResource{
logicalName: "LoadBalancer", logicalName: "LoadBalancer",