Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cherry-pick: Fix incorrect EnableTCPReset for non-TCP protocols #107981

Merged
merged 1 commit into from Mar 21, 2022
Merged

Cherry-pick: Fix incorrect EnableTCPReset for non-TCP protocols #107981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 15 additions & 4 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go
View file
Open in desktop
Expand Up @@ -1700,6 +1700,10 @@ func (az *Cloud) reconcileLoadBalancerRule(
loadDistribution = network.LoadDistributionSourceIP
}

tcpReset := enableTCPReset
if port.Protocol != v1.ProtocolTCP {
tcpReset = nil
}
expectedRule := network.LoadBalancingRule{
Name: &lbRuleName,
LoadBalancingRulePropertiesFormat: &network.LoadBalancingRulePropertiesFormat{
Expand All @@ -1714,7 +1718,7 @@ func (az *Cloud) reconcileLoadBalancerRule(
FrontendPort: to.Int32Ptr(port.Port),
BackendPort: to.Int32Ptr(port.Port),
DisableOutboundSnat: to.BoolPtr(az.disableLoadBalancerOutboundSNAT()),
EnableTCPReset: enableTCPReset,
EnableTCPReset: tcpReset,
EnableFloatingIP: to.BoolPtr(true),
},
}
Expand Down Expand Up @@ -2409,14 +2413,21 @@ func equalLoadBalancingRulePropertiesFormat(s *network.LoadBalancingRuleProperti
return false
}

properties := reflect.DeepEqual(s.Protocol, t.Protocol) &&
reflect.DeepEqual(s.FrontendIPConfiguration, t.FrontendIPConfiguration) &&
properties := reflect.DeepEqual(s.Protocol, t.Protocol)
if !properties {
return false
}

if reflect.DeepEqual(s.Protocol, network.TransportProtocolTCP) {
properties = properties && reflect.DeepEqual(to.Bool(s.EnableTCPReset), to.Bool(t.EnableTCPReset))
}

properties = properties && reflect.DeepEqual(s.FrontendIPConfiguration, t.FrontendIPConfiguration) &&
reflect.DeepEqual(s.BackendAddressPool, t.BackendAddressPool) &&
reflect.DeepEqual(s.LoadDistribution, t.LoadDistribution) &&
reflect.DeepEqual(s.FrontendPort, t.FrontendPort) &&
reflect.DeepEqual(s.BackendPort, t.BackendPort) &&
reflect.DeepEqual(s.EnableFloatingIP, t.EnableFloatingIP) &&
reflect.DeepEqual(to.Bool(s.EnableTCPReset), to.Bool(t.EnableTCPReset)) &&
reflect.DeepEqual(to.Bool(s.DisableOutboundSnat), to.Bool(t.DisableOutboundSnat))

if wantLB && s.IdleTimeoutInMinutes != nil && t.IdleTimeoutInMinutes != nil {
Expand Down
45 changes: 45 additions & 0 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go
View file
Open in desktop
Expand Up @@ -3909,3 +3909,48 @@ func TestEnsurePIPTagged(t *testing.T) {
assert.Equal(t, expectedPIP, pip)
})
}

func TestEqualLoadBalancingRulePropertiesFormat(t *testing.T) {
var enableTCPReset, disableTCPReset *bool = to.BoolPtr(true), to.BoolPtr(false)
var frontPort *int32 = to.Int32Ptr(80)

testcases := []struct {
s *network.LoadBalancingRulePropertiesFormat
t *network.LoadBalancingRulePropertiesFormat
wantLb bool
expected bool
}{
{
s: &network.LoadBalancingRulePropertiesFormat{
Protocol: network.TransportProtocolTCP,
EnableTCPReset: enableTCPReset,
FrontendPort: frontPort,
},
t: &network.LoadBalancingRulePropertiesFormat{
Protocol: network.TransportProtocolTCP,
EnableTCPReset: enableTCPReset,
FrontendPort: frontPort,
},
wantLb: true,
expected: true,
},
{
s: &network.LoadBalancingRulePropertiesFormat{
Protocol: network.TransportProtocolUDP,
EnableTCPReset: disableTCPReset,
FrontendPort: frontPort,
},
t: &network.LoadBalancingRulePropertiesFormat{
Protocol: network.TransportProtocolUDP,
EnableTCPReset: enableTCPReset,
FrontendPort: frontPort,
},
wantLb: true,
expected: true,
},
}

for _, tc := range testcases {
assert.Equal(t, tc.expected, equalLoadBalancingRulePropertiesFormat(tc.s, tc.t, tc.wantLb))
}
}