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
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
a512f686
Unverified
Commit
a512f686
authored
Sep 5, 2018
by
k8s-ci-robot
Committed by
GitHub
Sep 5, 2018
Browse files
Options
Downloads
Plain Diff
Merge pull request #3236 from luisyonaldo/fix-configure-calico-network-pool
Fix configure calico network pool for ipipMode = CrossSubnet
parents
769f99b3
65691806
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/network_plugin/calico/tasks/install.yml
+2
-2
2 additions, 2 deletions
roles/network_plugin/calico/tasks/install.yml
with
2 additions
and
2 deletions
roles/network_plugin/calico/tasks/install.yml
+
2
−
2
View file @
a512f686
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
},
},
"spec": {
"spec": {
"cidr": "{{ kube_pods_subnet }}",
"cidr": "{{ kube_pods_subnet }}",
"ipipMode": "{{ ipip_mode
|capitalize
}}",
"ipipMode": "{{ ipip_mode }}",
"natOutgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }} }} " | {{ bin_dir }}/calicoctl create -f -
"natOutgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }} }} " | {{ bin_dir }}/calicoctl create -f -
run_once
:
true
run_once
:
true
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
...
...
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
sign in
to comment