mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-11-13 06:04:02 +00:00
Removed deprecated --resource-container flag from kube-proxy.
This commit is contained in:
committed by
Vallery Lancey
parent
a444f0fa1d
commit
dc0f14312e
@@ -43,7 +43,7 @@ spec:
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- kube-proxy {{cluster_cidr}} --resource-container="" --oom-score-adj=-998 {{params}} 1>>/var/log/kube-proxy.log 2>&1
|
||||
- kube-proxy {{cluster_cidr}} --oom-score-adj=-998 {{params}} 1>>/var/log/kube-proxy.log 2>&1
|
||||
env:
|
||||
- name: KUBERNETES_SERVICE_HOST
|
||||
value: {{kubernetes_service_host_env_value}}
|
||||
|
||||
@@ -29,7 +29,7 @@ spec:
|
||||
command:
|
||||
- /bin/sh
|
||||
- -c
|
||||
- exec kube-proxy {{api_servers_with_port}} {{kubeconfig}} {{cluster_cidr}} --resource-container="" --oom-score-adj=-998 {{params}} 1>>/var/log/kube-proxy.log 2>&1
|
||||
- exec kube-proxy {{api_servers_with_port}} {{kubeconfig}} {{cluster_cidr}} --oom-score-adj=-998 {{params}} 1>>/var/log/kube-proxy.log 2>&1
|
||||
{{container_env}}
|
||||
{{kube_cache_mutation_detector_env_name}}
|
||||
{{kube_cache_mutation_detector_env_value}}
|
||||
|
||||
@@ -902,7 +902,6 @@ function construct-windows-kubeproxy-flags {
|
||||
# double-quotes, because they still break sc.exe after expansion in the
|
||||
# binPath parameter, and single-quotes get parsed as characters instead
|
||||
# of string delimiters.
|
||||
flags+=" --resource-container="
|
||||
|
||||
KUBEPROXY_ARGS="${flags}"
|
||||
}
|
||||
|
||||
@@ -972,7 +972,7 @@ function Start-WorkerServices {
|
||||
# generated by start-kube-proxy in configure-helper.sh and contains e.g.:
|
||||
# kube-proxy --master=https://35.239.84.171
|
||||
# --kubeconfig=/var/lib/kube-proxy/kubeconfig --cluster-cidr=10.64.0.0/14
|
||||
# --resource-container="" --oom-score-adj=-998 --v=2
|
||||
# --oom-score-adj=-998 --v=2
|
||||
# --feature-gates=ExperimentalCriticalPodAnnotation=true
|
||||
# --iptables-sync-period=1m --iptables-min-sync-period=10s
|
||||
# --ipvs-sync-period=1m --ipvs-min-sync-period=10s
|
||||
|
||||
Reference in New Issue
Block a user