C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* Add resource-container flag to kube-proxy manifest

* add resourceContainer: "" to kubeadm kube-proxy configs
This commit is contained in:
Danny Kulchinsky 2018-11-19 03:39:29 -05:00 committed by k8s-ci-robot
parent 8c18f053aa
commit 9ae2eefb9a
4 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

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

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