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
d2935ffe
Unverified
Commit
d2935ffe
authored
7 years ago
by
Matthew Mosesohn
Committed by
GitHub
7 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Optionally ignore the presence of extra calico pools (#2190)
parent
c6e0fcea
No related branches found
No related tags found
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
+3
-0
3 additions, 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
4 additions
and
1 deletion
roles/network_plugin/calico/defaults/main.yml
+
3
−
0
View file @
d2935ffe
...
...
@@ -16,6 +16,9 @@ etcd_cert_dir: /etc/ssl/etcd/ssl
# Global as_num (/calico/bgp/v1/global/as_num)
global_as_num
:
"
64512"
# Set to true if you need to configure multiple pools (this is not common)
calico_ignore_extra_pools
:
false
# You can set MTU value here. If left undefined or empty, it will
# not be specified in calico CNI config, so Calico will use built-in
# defaults. The value should be a number, not a string.
...
...
This diff is collapsed.
Click to expand it.
roles/network_plugin/calico/tasks/main.yml
+
1
−
1
View file @
d2935ffe
...
...
@@ -142,7 +142,7 @@
fail
:
msg
:
'
Only
one
network
pool
must
be
configured
and
it
must
be
the
subnet
{{
kube_pods_subnet
}}.
Please
erase
calico
configuration
and
run
the
playbook
again
("etcdctl
rm
--recursive
/calico/v1/ipam/v4/pool")'
when
:
( calico_pools['node']['nodes'] | length > 1 ) or
when
:
( calico_pools['node']['nodes'] | length > 1
and not calico_ignore_extra_pools
) or
( not calico_pools['node']['nodes'][0]['key'] | search(".*{{ kube_pods_subnet | ipaddr('network') }}.*") )
run_once
:
true
...
...
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