mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #101898 from CaoDonghui123/removeazure
Remove azure disable-tcp-reset annotations
This commit is contained in:
commit
4604219c99
@ -99,11 +99,6 @@ const (
|
||||
// to enable the high availability ports on the standard internal load balancer.
|
||||
ServiceAnnotationLoadBalancerEnableHighAvailabilityPorts = "service.beta.kubernetes.io/azure-load-balancer-enable-high-availability-ports"
|
||||
|
||||
// ServiceAnnotationLoadBalancerDisableTCPReset is the annotation used on the service
|
||||
// to set enableTcpReset to false in load balancer rule. This only works for Azure standard load balancer backed service.
|
||||
// TODO(feiskyer): disable-tcp-reset annotations has been depracated since v1.18, it would removed on v1.20.
|
||||
ServiceAnnotationLoadBalancerDisableTCPReset = "service.beta.kubernetes.io/azure-load-balancer-disable-tcp-reset"
|
||||
|
||||
// ServiceAnnotationLoadBalancerHealthProbeProtocol determines the network protocol that the load balancer health probe use.
|
||||
// If not set, the local service would use the HTTP and the cluster service would use the TCP by default.
|
||||
ServiceAnnotationLoadBalancerHealthProbeProtocol = "service.beta.kubernetes.io/azure-load-balancer-health-probe-protocol"
|
||||
@ -1627,9 +1622,6 @@ func (az *Cloud) reconcileLoadBalancerRule(
|
||||
var enableTCPReset *bool
|
||||
if az.useStandardLoadBalancer() {
|
||||
enableTCPReset = to.BoolPtr(true)
|
||||
if _, ok := service.Annotations[ServiceAnnotationLoadBalancerDisableTCPReset]; ok {
|
||||
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.")
|
||||
}
|
||||
}
|
||||
|
||||
var expectedProbes []network.Probe
|
||||
|
Loading…
Reference in New Issue
Block a user