github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #76223 from frankgreco/automated-cherry-pick-of-#76216-upstream-release-1.14 

Automated cherry pick of #76216: ensuring that logic is checking for differences in listener
pull/564/head
Kubernetes Prow Robot 2019-04-30 15:38:56 -07:00 committed by GitHub
parent c72a5b2c10 6a45dd9a22
commit 8c00490d9b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View File

@ -1112,10 +1112,10 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
found := -1 found := -1
for i, expected := range listeners { for i, expected := range listeners {
if elbProtocolsAreEqual(actual.Protocol, expected.Protocol) { if !elbProtocolsAreEqual(actual.Protocol, expected.Protocol) {
continue continue
} }
if elbProtocolsAreEqual(actual.InstanceProtocol, expected.InstanceProtocol) { if !elbProtocolsAreEqual(actual.InstanceProtocol, expected.InstanceProtocol) {
continue continue
} }
if aws.Int64Value(actual.InstancePort) != aws.Int64Value(expected.InstancePort) { if aws.Int64Value(actual.InstancePort) != aws.Int64Value(expected.InstancePort) {
@ -1124,7 +1124,7 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala
if aws.Int64Value(actual.LoadBalancerPort) != aws.Int64Value(expected.LoadBalancerPort) { if aws.Int64Value(actual.LoadBalancerPort) != aws.Int64Value(expected.LoadBalancerPort) {
continue continue
} }
if awsArnEquals(actual.SSLCertificateId, expected.SSLCertificateId) { if !awsArnEquals(actual.SSLCertificateId, expected.SSLCertificateId) {
continue continue
} }
found = i found = i