Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
9d069d54
Commit
9d069d54
authored
8 years ago
by
Smaine Kahlouch
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #530 from adidenko/fix-calico-cluster-ip
Add support for --masquerade-all in kube-proxy
parents
016b7893
fb0ee9d8
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/kubernetes/node/defaults/main.yml
+3
-0
3 additions, 0 deletions
roles/kubernetes/node/defaults/main.yml
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
+3
-0
3 additions, 0 deletions
...ubernetes/node/templates/manifests/kube-proxy.manifest.j2
with
6 additions
and
0 deletions
roles/kubernetes/node/defaults/main.yml
+
3
−
0
View file @
9d069d54
...
@@ -8,6 +8,9 @@ kube_resolv_conf: "/etc/resolv.conf"
...
@@ -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
This diff is collapsed.
Click to expand it.
roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
+
3
−
0
View file @
9d069d54
...
@@ -18,6 +18,9 @@ spec:
...
@@ -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:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment