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

Merge pull request #5485 from justinsb/only_decrypt_at_elb_if_have_cert 

Only use SSL for ELB if certificate configured
This commit is contained in:
k8s-ci-robot 2018-07-21 13:53:51 -07:00 committed by GitHub
parent 19b81f011d 7b58bb3a6b
commit f611347090
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
upup/pkg/fi/cloudup/awstasks/load_balancer.go
View File

@ -78,13 +78,21 @@ type LoadBalancerListener struct {
} }
func (e *LoadBalancerListener) mapToAWS(loadBalancerPort int64) *elb.Listener { func (e *LoadBalancerListener) mapToAWS(loadBalancerPort int64) *elb.Listener {
return &elb.Listener{ l := &elb.Listener{
LoadBalancerPort: aws.Int64(loadBalancerPort), LoadBalancerPort: aws.Int64(loadBalancerPort),
Protocol: aws.String("SSL"),
InstanceProtocol: aws.String("SSL"),
InstancePort: aws.Int64(int64(e.InstancePort)), InstancePort: aws.Int64(int64(e.InstancePort)),
SSLCertificateId: aws.String(e.SSLCertificateID),
} }
if e.SSLCertificateID != "" {
l.Protocol = aws.String("SSL")
l.InstanceProtocol = aws.String("SSL")
l.SSLCertificateId = aws.String(e.SSLCertificateID)
} else {
l.Protocol = aws.String("TCP")
l.InstanceProtocol = aws.String("TCP")
}
return l
} }
var _ fi.HasDependencies = &LoadBalancerListener{} var _ fi.HasDependencies = &LoadBalancerListener{}