diff --git a/roles/kubernetes/master/defaults/main/kube-proxy.yml b/roles/kubernetes/master/defaults/main/kube-proxy.yml index 0452b22775d142b31cd0fafa7c47891d4f940316..d0725ba19c38d2407acf822b2ba5158e10524f62 100644 --- a/roles/kubernetes/master/defaults/main/kube-proxy.yml +++ b/roles/kubernetes/master/defaults/main/kube-proxy.yml @@ -101,10 +101,6 @@ kube_proxy_oom_score_adj: -999 # in order to proxy service traffic. If unspecified, 0, or (0-0) then ports will be randomly chosen. kube_proxy_port_range: '' -# resourceContainer is the absolute name of the resource-only container to create and run -# the Kube-proxy in (Default: /kube-proxy). -kube_proxy_resource_container: /kube-proxy - # 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 diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 index 1c177ba9c7bc41048f2aee2e98a907e837676acb..d79843204d9af538031bac829bf890c6b4124463 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta1.yaml.j2 @@ -327,5 +327,4 @@ mode: {{ kube_proxy_mode }} nodePortAddresses: {{ kube_proxy_nodeport_addresses }} oomScoreAdj: {{ kube_proxy_oom_score_adj }} portRange: {{ kube_proxy_port_range }} -resourceContainer: {{ kube_proxy_resource_container }} udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }} diff --git a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 index f92edb5085744fa1fab77f1f7dd493ca3d86a4d0..645a0ec1a1be15af8564f1f9e84e1b6f1a1d09c8 100644 --- a/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 +++ b/roles/kubernetes/master/templates/kubeadm-config.v1beta2.yaml.j2 @@ -329,5 +329,4 @@ mode: {{ kube_proxy_mode }} nodePortAddresses: {{ kube_proxy_nodeport_addresses }} oomScoreAdj: {{ kube_proxy_oom_score_adj }} portRange: {{ kube_proxy_port_range }} -resourceContainer: {{ kube_proxy_resource_container }} udpIdleTimeout: {{ kube_proxy_udp_idle_timeout }}