From baed5f0b321f9419d047195b54626634cc2eaad6 Mon Sep 17 00:00:00 2001 From: HirazawaUi <695097494plus@gmail.com> Date: Mon, 27 Mar 2023 17:05:55 +0800 Subject: [PATCH] Remove deprecated udpIdleTimeout field in KubeProxyConfiguration (#9925) --- roles/kubernetes/control-plane/defaults/main/kube-proxy.yml | 6 +----- .../control-plane/templates/kubeadm-config.v1beta3.yaml.j2 | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/roles/kubernetes/control-plane/defaults/main/kube-proxy.yml b/roles/kubernetes/control-plane/defaults/main/kube-proxy.yml index 52346fad1..5503212ab 100644 --- a/roles/kubernetes/control-plane/defaults/main/kube-proxy.yml +++ b/roles/kubernetes/control-plane/defaults/main/kube-proxy.yml @@ -111,8 +111,4 @@ kube_proxy_oom_score_adj: -999 # portRange is the range of host ports (beginPort-endPort, inclusive) that may be consumed # in order to proxy service traffic. If unspecified, 0, or (0-0) then ports will be randomly chosen. -kube_proxy_port_range: '' - -# udpIdleTimeout is how long an idle UDP connection will be kept open (e.g. '250ms', '2s'). -# Must be greater than 0. Only applicable for proxyMode=userspace. -kube_proxy_udp_idle_timeout: 250ms +kube_proxy_port_range: '' \ No newline at end of file diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 index 2fbd5534d..1bb31ba82 100644 --- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 +++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta3.yaml.j2 @@ -417,7 +417,6 @@ mode: {{ kube_proxy_mode }} nodePortAddresses: {{ kube_proxy_nodeport_addresses }} oomScoreAdj: {{ kube_proxy_oom_score_adj }} portRange: {{ kube_proxy_port_range }} -udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }} {% if kube_proxy_feature_gates or kube_feature_gates %} {% set feature_gates = ( kube_proxy_feature_gates | default(kube_feature_gates, true) ) %} featureGates: