Browse Source

Add resource-container flag to kube-proxy manifest (#3519)

* Add resource-container flag to kube-proxy manifest

* add resourceContainer: "" to kubeadm kube-proxy configs
pull/3736/head
Danny Kulchinsky 6 years ago
committed by k8s-ci-robot
parent
commit
9ae2eefb9a
4 changed files with 4 additions and 1 deletions
  1. 1
      roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2
  2. 1
      roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2
  3. 2
      roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2
  4. 1
      roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2

1
roles/kubernetes/master/templates/kubeadm-config.v1alpha1.yaml.j2

@ -39,6 +39,7 @@ kubeProxy:
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
resourceContainer: ""
authorizationModes:
{% for mode in authorization_modes %}
- {{ mode }}

1
roles/kubernetes/master/templates/kubeadm-config.v1alpha2.yaml.j2

@ -31,6 +31,7 @@ kubeProxy:
{% if kube_proxy_nodeport_addresses %}
nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
resourceContainer: ""
authorizationModes:
{% for mode in authorization_modes %}
- {{ mode }}

2
roles/kubernetes/master/templates/kubeadm-config.v1alpha3.yaml.j2

@ -197,5 +197,5 @@ nodePortAddresses: [{{ kube_proxy_nodeport_addresses_cidr }}]
{% endif %}
oomScoreAdj: -999
portRange: ""
resourceContainer: /kube-proxy
resourceContainer: ""
udpIdleTimeout: 250ms

1
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2

@ -48,6 +48,7 @@ spec:
- --proxy-mode={{ kube_proxy_mode }}
- --oom-score-adj=-998
- --healthz-bind-address={{ kube_proxy_healthz_bind_address }}
- --resource-container=""
{% if kube_proxy_nodeport_addresses %}
- --nodeport-addresses={{ kube_proxy_nodeport_addresses_cidr }}
{% endif %}

Loading…
Cancel
Save