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

Automated cherry pick of #85990: Fix LoadBalancer rule checking so that no unexpected #86054

Merged
merged 1 commit into from Dec 15, 2019
Merged

Automated cherry pick of #85990: Fix LoadBalancer rule checking so that no unexpected #86054

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
2 changes: 1 addition & 1 deletion staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go
View file
Open in desktop
Expand Up @@ -1643,7 +1643,7 @@ func equalLoadBalancingRulePropertiesFormat(s *network.LoadBalancingRuleProperti
reflect.DeepEqual(s.EnableTCPReset, t.EnableTCPReset) &&
reflect.DeepEqual(s.DisableOutboundSnat, t.DisableOutboundSnat)

if wantLB {
if wantLB && s.IdleTimeoutInMinutes != nil && t.IdleTimeoutInMinutes != nil {
return properties && reflect.DeepEqual(s.IdleTimeoutInMinutes, t.IdleTimeoutInMinutes)
}
return properties
Expand Down
34 changes: 34 additions & 0 deletions staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go
View file
Open in desktop
Expand Up @@ -173,6 +173,40 @@ func TestFindRule(t *testing.T) {
},
expected: false,
},
{
msg: "rule names match while idletimeout unmatch should return false",
existingRule: []network.LoadBalancingRule{
{
Name: to.StringPtr("httpRule"),
LoadBalancingRulePropertiesFormat: &network.LoadBalancingRulePropertiesFormat{
IdleTimeoutInMinutes: to.Int32Ptr(1),
},
},
},
curRule: network.LoadBalancingRule{
Name: to.StringPtr("httpRule"),
LoadBalancingRulePropertiesFormat: &network.LoadBalancingRulePropertiesFormat{
IdleTimeoutInMinutes: to.Int32Ptr(2),
},
},
expected: false,
},
{
msg: "rule names match while idletimeout nil should return true",
existingRule: []network.LoadBalancingRule{
{
Name: to.StringPtr("httpRule"),
LoadBalancingRulePropertiesFormat: &network.LoadBalancingRulePropertiesFormat{},
},
},
curRule: network.LoadBalancingRule{
Name: to.StringPtr("httpRule"),
LoadBalancingRulePropertiesFormat: &network.LoadBalancingRulePropertiesFormat{
IdleTimeoutInMinutes: to.Int32Ptr(2),
},
},
expected: true,
},
{
msg: "rule names match while LoadDistribution unmatch should return false",
existingRule: []network.LoadBalancingRule{
Expand Down