github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #94297 from MarcPow/remove-service-annotation-disable-tcp-reset

Browse Source 
Remove azure-load-balancer-disable-tcp-reset annotation
This commit is contained in:
Kubernetes Prow Robot 2020-09-06 22:17:41 -07:00 committed by GitHub
commit 35e235bba7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1025,10 +1025,8 @@ func (az *Cloud) reconcileLoadBalancerRule(
var enableTCPReset *bool var enableTCPReset *bool
if az.useStandardLoadBalancer() { if az.useStandardLoadBalancer() {
enableTCPReset = to.BoolPtr(true) enableTCPReset = to.BoolPtr(true)
if v, ok := service.Annotations[ServiceAnnotationLoadBalancerDisableTCPReset]; ok { if _, ok := service.Annotations[ServiceAnnotationLoadBalancerDisableTCPReset]; ok {
klog.Warning("annotation service.beta.kubernetes.io/azure-load-balancer-disable-tcp-reset has been depracated, it would be removed in a future release") klog.Warning("annotation service.beta.kubernetes.io/azure-load-balancer-disable-tcp-reset has been removed as of Kubernetes 1.20. TCP Resets are always enabled on Standard SKU load balancers.")
klog.V(2).Infof("reconcileLoadBalancerRule lb name (%s) flag(%s) is set to %s", lbName, ServiceAnnotationLoadBalancerDisableTCPReset, v)
enableTCPReset = to.BoolPtr(!strings.EqualFold(v, "true"))
} }
} }

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

@ -1058,9 +1058,10 @@ func TestReconcileLoadBalancerRule(t *testing.T) {
wantLb: false, wantLb: false,
}, },
{ {
desc: "reconcileLoadBalancerRule shall return corresponding probe and lbRule(blb)", desc: "reconcileLoadBalancerRule shall return corresponding probe and lbRule(blb)",
service: getTestService("test1", v1.ProtocolTCP, map[string]string{"service.beta.kubernetes.io/azure-load-balancer-disable-tcp-reset": "true"}, false, 80), service: getTestService("test1", v1.ProtocolTCP, map[string]string{"service.beta.kubernetes.io/azure-load-balancer-disable-tcp-reset": "true"}, false, 80),
wantLb: true, loadBalancerSku: "basic",
wantLb: true,
expectedProbes: []network.Probe{ expectedProbes: []network.Probe{
{ {
Name: to.StringPtr("atest1-TCP-80"), Name: to.StringPtr("atest1-TCP-80"),
@ -1135,7 +1136,7 @@ func TestReconcileLoadBalancerRule(t *testing.T) {
ID: to.StringPtr("/subscriptions/subscription/resourceGroups/rg/providers/" + ID: to.StringPtr("/subscriptions/subscription/resourceGroups/rg/providers/" +
"Microsoft.Network/loadBalancers/lbname/probes/atest1-TCP-80"), "Microsoft.Network/loadBalancers/lbname/probes/atest1-TCP-80"),
}, },
EnableTCPReset: to.BoolPtr(false), EnableTCPReset: to.BoolPtr(true),
}, },
}, },
}, },
@ -1361,7 +1362,7 @@ func TestReconcileLoadBalancer(t *testing.T) {
expectedSLb := getTestLoadBalancer(to.StringPtr("testCluster"), to.StringPtr("rg"), to.StringPtr("testCluster"), to.StringPtr("aservice1"), service4, "Standard") expectedSLb := getTestLoadBalancer(to.StringPtr("testCluster"), to.StringPtr("rg"), to.StringPtr("testCluster"), to.StringPtr("aservice1"), service4, "Standard")
(*expectedSLb.LoadBalancerPropertiesFormat.LoadBalancingRules)[0].DisableOutboundSnat = to.BoolPtr(true) (*expectedSLb.LoadBalancerPropertiesFormat.LoadBalancingRules)[0].DisableOutboundSnat = to.BoolPtr(true)
(*expectedSLb.LoadBalancerPropertiesFormat.LoadBalancingRules)[0].EnableTCPReset = to.BoolPtr(false) (*expectedSLb.LoadBalancerPropertiesFormat.LoadBalancingRules)[0].EnableTCPReset = to.BoolPtr(true)
expectedSLb.FrontendIPConfigurations = &[]network.FrontendIPConfiguration{ expectedSLb.FrontendIPConfigurations = &[]network.FrontendIPConfiguration{
{ {
Name: to.StringPtr("aservice1"), Name: to.StringPtr("aservice1"),
@ -1410,7 +1411,7 @@ func TestReconcileLoadBalancer(t *testing.T) {
}, },
} }
//change to false to test that reconciliation will fix it //change to false to test that reconciliation will fix it (despite the fact that disable-tcp-reset was removed in 1.20)
(*slb5.LoadBalancerPropertiesFormat.LoadBalancingRules)[0].EnableTCPReset = to.BoolPtr(false) (*slb5.LoadBalancerPropertiesFormat.LoadBalancingRules)[0].EnableTCPReset = to.BoolPtr(false)
expectedSLb5 := getTestLoadBalancer(to.StringPtr("testCluster"), to.StringPtr("rg"), to.StringPtr("testCluster"), to.StringPtr("aservice1"), service5, "Standard") expectedSLb5 := getTestLoadBalancer(to.StringPtr("testCluster"), to.StringPtr("rg"), to.StringPtr("testCluster"), to.StringPtr("aservice1"), service5, "Standard")
@ -1561,7 +1562,7 @@ func TestReconcileLoadBalancer(t *testing.T) {
expectedError: nil, expectedError: nil,
}, },
{ {
desc: "reconcileLoadBalancer shall remove and reconstruct the correspoind field of lb and set enableTcpReset to false in lbRule", desc: "reconcileLoadBalancer shall remove and reconstruct the correspoind field of lb and set enableTcpReset to true in lbRule",
loadBalancerSku: "standard", loadBalancerSku: "standard",
service: service4, service: service4,
disableOutboundSnat: to.BoolPtr(true), disableOutboundSnat: to.BoolPtr(true),
@ -1571,7 +1572,7 @@ func TestReconcileLoadBalancer(t *testing.T) {
expectedError: nil, expectedError: nil,
}, },
{ {
desc: "reconcileLoadBalancer shall remove and reconstruct the correspoind field of lb and set enableTcpReset to true in lbRule", desc: "reconcileLoadBalancer shall remove and reconstruct the correspoind field of lb and set enableTcpReset (false => true) in lbRule",
loadBalancerSku: "standard", loadBalancerSku: "standard",
service: service5, service: service5,
disableOutboundSnat: to.BoolPtr(true), disableOutboundSnat: to.BoolPtr(true),