Merge pull request #530 from adidenko/fix-calico-cluster-ip

Add support for --masquerade-all in kube-proxy
This commit is contained in:
Smaine Kahlouch 2016-10-03 16:49:31 +02:00 committed by GitHub
commit 064f7d8ccf
2 changed files with 6 additions and 0 deletions

View file

@ -8,6 +8,9 @@ kube_resolv_conf: "/etc/resolv.conf"
kube_proxy_mode: iptables kube_proxy_mode: iptables
# If using the pure iptables proxy, SNAT everything
kube_proxy_masquerade_all: true
# kube_api_runtime_config: # kube_api_runtime_config:
# - extensions/v1beta1/daemonsets=true # - extensions/v1beta1/daemonsets=true
# - extensions/v1beta1/deployments=true # - extensions/v1beta1/deployments=true

View file

@ -18,6 +18,9 @@ spec:
{% endif %} {% endif %}
- --bind-address={{ ip | default(ansible_default_ipv4.address) }} - --bind-address={{ ip | default(ansible_default_ipv4.address) }}
- --proxy-mode={{ kube_proxy_mode }} - --proxy-mode={{ kube_proxy_mode }}
{% if kube_proxy_masquerade_all and kube_proxy_mode == "iptables" %}
- --masquerade-all
{% endif %}
securityContext: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts: