github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #85990 from feiskyer/fix-85989

Browse Source 
Fix LoadBalancer rule checking so that no unexpected LoadBalancer updates are made
This commit is contained in:
Kubernetes Prow Robot 2019-12-06 04:06:49 -08:00 committed by GitHub
commit b5040be796
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer.go
View File

@ -1641,7 +1641,7 @@ func equalLoadBalancingRulePropertiesFormat(s *network.LoadBalancingRuleProperti
reflect.DeepEqual(s.EnableTCPReset, t.EnableTCPReset) && reflect.DeepEqual(s.EnableTCPReset, t.EnableTCPReset) &&
reflect.DeepEqual(s.DisableOutboundSnat, t.DisableOutboundSnat) 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 && reflect.DeepEqual(s.IdleTimeoutInMinutes, t.IdleTimeoutInMinutes)
} }
return properties return properties

34
staging/src/k8s.io/legacy-cloud-providers/azure/azure_loadbalancer_test.go
View File

@ -173,6 +173,40 @@ func TestFindRule(t *testing.T) {
}, },
expected: false, 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", msg: "rule names match while LoadDistribution unmatch should return false",
existingRule: []network.LoadBalancingRule{ existingRule: []network.LoadBalancingRule{