Skip to content

K
k3s
Unverified Commit 1ff857e1 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #76216 from frankgreco/ensureLoadBalancer-aws-bug

ensuring that logic is checking for differences in listener
parents 52ec2a00 ce9c4bf9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/cloudprovider/providers/aws/aws_loadbalancer.go
View file @ 1ff857e1
...@@ -1112,10 +1112,10 @@ func (c *Cloud) ensureLoadBalancer(namespacedName types.NamespacedName, loadBala ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment