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
a742d10c
Commit
a742d10c
authored
7 years ago
by
Kevin Jing Qiu
Browse files
Options
Downloads
Patches
Plain Diff
Allow calico ipPool to be created with mode "cross-subnet"
parent
6e7323e3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/network_plugin/calico/defaults/main.yml
+1
-0
1 addition, 0 deletions
roles/network_plugin/calico/defaults/main.yml
roles/network_plugin/calico/tasks/main.yml
+1
-1
1 addition, 1 deletion
roles/network_plugin/calico/tasks/main.yml
with
2 additions
and
1 deletion
roles/network_plugin/calico/defaults/main.yml
+
1
−
0
View file @
a742d10c
...
...
@@ -4,6 +4,7 @@ nat_outgoing: true
# Use IP-over-IP encapsulation across hosts
ipip
:
false
ipip_mode
:
always
# change to "cross-subnet" if you only want ipip encapsulation on traffic going across subnets
# Set to true if you want your calico cni binaries to overwrite the
# ones from hyperkube while leaving other cni plugins intact.
...
...
This diff is collapsed.
Click to expand it.
roles/network_plugin/calico/tasks/main.yml
+
1
−
1
View file @
a742d10c
...
...
@@ -94,7 +94,7 @@
shell
:
>
echo '{
"kind": "ipPool",
"spec": {"disabled": false, "ipip": {"enabled": {{ cloud_provider is defined or ipip }}},
"spec": {"disabled": false, "ipip": {"enabled": {{ cloud_provider is defined or ipip }}
, "mode": "{{ ipip_mode }}"
},
"nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}},
"apiVersion": "v1",
"metadata": {"cidr": "{{ kube_pods_subnet }}"}
...
...
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