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

Merge pull request #97096 from nilo19/cleanup/deprecate-mix-protocol-annotation

Browse Source 
Delete deprecated mixed procotol annotation
This commit is contained in:
Kubernetes Prow Robot 2020-12-08 22:01:27 -08:00 committed by GitHub
commit 42d19f9641
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 88 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,10 +95,6 @@ const (
// to specify the idle timeout for connections on the load balancer in minutes. // to specify the idle timeout for connections on the load balancer in minutes.
ServiceAnnotationLoadBalancerIdleTimeout = "service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout" ServiceAnnotationLoadBalancerIdleTimeout = "service.beta.kubernetes.io/azure-load-balancer-tcp-idle-timeout"
// ServiceAnnotationLoadBalancerMixedProtocols is the annotation used on the service
// to create both TCP and UDP protocols when creating load balancer rules.
ServiceAnnotationLoadBalancerMixedProtocols = "service.beta.kubernetes.io/azure-load-balancer-mixed-protocols"
// ServiceAnnotationLoadBalancerEnableHighAvailabilityPorts is the annotation used on the service // ServiceAnnotationLoadBalancerEnableHighAvailabilityPorts is the annotation used on the service
// to enable the high availability ports on the standard internal load balancer. // to enable the high availability ports on the standard internal load balancer.
ServiceAnnotationLoadBalancerEnableHighAvailabilityPorts = "service.beta.kubernetes.io/azure-load-balancer-enable-high-availability-ports" ServiceAnnotationLoadBalancerEnableHighAvailabilityPorts = "service.beta.kubernetes.io/azure-load-balancer-enable-high-availability-ports"
@ -1627,21 +1623,10 @@ func (az *Cloud) reconcileLoadBalancerRule(
var expectedProbes []network.Probe var expectedProbes []network.Probe
var expectedRules []network.LoadBalancingRule var expectedRules []network.LoadBalancingRule
for _, port := range ports { for _, port := range ports {
protocols := []v1.Protocol{port.Protocol} lbRuleName := az.getLoadBalancerRuleName(service, port.Protocol, port.Port)
if v, ok := service.Annotations[ServiceAnnotationLoadBalancerMixedProtocols]; ok && v == "true" {
klog.V(2).Infof("reconcileLoadBalancerRule lb name (%s) flag(%s) is set", lbName, ServiceAnnotationLoadBalancerMixedProtocols)
if port.Protocol == v1.ProtocolTCP {
protocols = append(protocols, v1.ProtocolUDP)
} else if port.Protocol == v1.ProtocolUDP {
protocols = append(protocols, v1.ProtocolTCP)
}
}
for _, protocol := range protocols {
lbRuleName := az.getLoadBalancerRuleName(service, protocol, port.Port)
klog.V(2).Infof("reconcileLoadBalancerRule lb name (%s) rule name (%s)", lbName, lbRuleName) klog.V(2).Infof("reconcileLoadBalancerRule lb name (%s) rule name (%s)", lbName, lbRuleName)
transportProto, _, probeProto, err := getProtocolsFromKubernetesProtocol(protocol) transportProto, _, probeProto, err := getProtocolsFromKubernetesProtocol(port.Protocol)
if err != nil { if err != nil {
return expectedProbes, expectedRules, err return expectedProbes, expectedRules, err
} }
@ -1666,7 +1651,7 @@ func (az *Cloud) reconcileLoadBalancerRule(
NumberOfProbes: to.Int32Ptr(2), NumberOfProbes: to.Int32Ptr(2),
}, },
}) })
} else if protocol != v1.ProtocolUDP && protocol != v1.ProtocolSCTP { } else if port.Protocol != v1.ProtocolUDP && port.Protocol != v1.ProtocolSCTP {
// we only add the expected probe if we're doing TCP // we only add the expected probe if we're doing TCP
if probeProtocol == "" { if probeProtocol == "" {
probeProtocol = string(*probeProto) probeProtocol = string(*probeProto)
@ -1715,7 +1700,7 @@ func (az *Cloud) reconcileLoadBalancerRule(
}, },
} }
if protocol == v1.ProtocolTCP { if port.Protocol == v1.ProtocolTCP {
expectedRule.LoadBalancingRulePropertiesFormat.IdleTimeoutInMinutes = lbIdleTimeout expectedRule.LoadBalancingRulePropertiesFormat.IdleTimeoutInMinutes = lbIdleTimeout
} }
@ -1729,7 +1714,7 @@ func (az *Cloud) reconcileLoadBalancerRule(
// we didn't construct the probe objects for UDP or SCTP because they're not allowed on Azure. // we didn't construct the probe objects for UDP or SCTP because they're not allowed on Azure.
// However, when externalTrafficPolicy is Local, Kubernetes HTTP health check would be used for probing. // However, when externalTrafficPolicy is Local, Kubernetes HTTP health check would be used for probing.
if servicehelpers.NeedsHealthCheck(service) || (protocol != v1.ProtocolUDP && protocol != v1.ProtocolSCTP) { if servicehelpers.NeedsHealthCheck(service) || (port.Protocol != v1.ProtocolUDP && port.Protocol != v1.ProtocolSCTP) {
expectedRule.Probe = &network.SubResource{ expectedRule.Probe = &network.SubResource{
ID: to.StringPtr(az.getLoadBalancerProbeID(lbName, az.getLoadBalancerResourceGroup(), lbRuleName)), ID: to.StringPtr(az.getLoadBalancerProbeID(lbName, az.getLoadBalancerResourceGroup(), lbRuleName)),
} }
@ -1737,7 +1722,6 @@ func (az *Cloud) reconcileLoadBalancerRule(
expectedRules = append(expectedRules, expectedRule) expectedRules = append(expectedRules, expectedRule)
} }
}
return expectedProbes, expectedRules, nil return expectedProbes, expectedRules, nil
} }