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
d91f9e14
Commit
d91f9e14
authored
6 years ago
by
Matthew Mosesohn
Browse files
Options
Downloads
Patches
Plain Diff
Put back legacy support for calico ippools and bgp settings
parent
18f0531b
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/network_plugin/calico/tasks/check.yml
+1
-0
1 addition, 0 deletions
roles/network_plugin/calico/tasks/check.yml
roles/network_plugin/calico/tasks/install.yml
+45
-10
45 additions, 10 deletions
roles/network_plugin/calico/tasks/install.yml
with
46 additions
and
10 deletions
roles/network_plugin/calico/tasks/check.yml
+
1
−
0
View file @
d91f9e14
...
@@ -22,6 +22,7 @@
...
@@ -22,6 +22,7 @@
that
:
that
:
-
calico_version_on_server.stdout|version_compare('v2.6.5', '>=')
-
calico_version_on_server.stdout|version_compare('v2.6.5', '>=')
msg
:
"
Your
version
of
calico
is
not
fresh
enough
for
upgrade"
msg
:
"
Your
version
of
calico
is
not
fresh
enough
for
upgrade"
when
:
calico_upgrade_enabled
-
name
:
"
Set
upgrade
flag
when
version
needs
to
be
updated"
-
name
:
"
Set
upgrade
flag
when
version
needs
to
be
updated"
set_fact
:
set_fact
:
...
...
This diff is collapsed.
Click to expand it.
roles/network_plugin/calico/tasks/install.yml
+
45
−
10
View file @
d91f9e14
---
---
-
name
:
Calico | Write Calico cni config
-
name
:
Calico | Write Calico cni config
template
:
template
:
src
:
"
cni-calico.conflist.j2"
src
:
"
cni-calico.conflist.j2"
...
@@ -102,6 +101,25 @@
...
@@ -102,6 +101,25 @@
run_once
:
true
run_once
:
true
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
when
:
when
:
-
calico_version_on_server.stdout|version_compare('v3.0.0', '>') or calico_upgrade_enabled
-
'
calico_conf.stdout
==
"0"'
-
name
:
Calico | Configure calico network pool (legacy)
shell
:
>
echo '
{ "kind": "ipPool",
"spec": {"disabled": false, "ipip": {"enabled": {{ ipip }}, "mode": "{{ ipip_mode|lower }}"},
"nat-outgoing": {{ nat_outgoing|default(false) and not peer_with_router|default(false) }}},
"apiVersion": "v1",
"metadata": {"cidr": "{{ kube_pods_subnet }}"}
}' | {{ bin_dir }}/calicoctl apply -f -
environment
:
NO_DEFAULT_POOLS
:
true
run_once
:
true
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
when
:
-
calico_version_on_server.stdout|version_compare('v3.0.0', '<')
-
not calico_upgrade_enabled
-
'
calico_conf.stdout
==
"0"'
-
'
calico_conf.stdout
==
"0"'
-
name
:
"
Determine
nodeToNodeMesh
needed
state"
-
name
:
"
Determine
nodeToNodeMesh
needed
state"
...
@@ -112,7 +130,6 @@
...
@@ -112,7 +130,6 @@
-
inventory_hostname in groups['k8s-cluster']
-
inventory_hostname in groups['k8s-cluster']
run_once
:
yes
run_once
:
yes
-
name
:
Calico | Set global as_num
-
name
:
Calico | Set global as_num
shell
:
>
shell
:
>
echo '
echo '
...
@@ -127,6 +144,24 @@
...
@@ -127,6 +144,24 @@
"asNumber": {{ global_as_num }} }} ' | {{ bin_dir }}/calicoctl --skip-exists create -f -
"asNumber": {{ global_as_num }} }} ' | {{ bin_dir }}/calicoctl --skip-exists create -f -
run_once
:
true
run_once
:
true
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
delegate_to
:
"
{{
groups['kube-master'][0]
}}"
when
:
-
calico_version_on_server.stdout|version_compare('v3.0.0', '>') or calico_upgrade_enabled
-
name
:
Calico | Set global as_num (legacy)
command
:
"
{{
bin_dir}}/calicoctl
config
set
asNumber
{{
global_as_num
}}"
run_once
:
true
when
:
-
calico_version_on_server.stdout|version_compare('v3.0.0', '<')
-
not calico_upgrade_enabled
-
name
:
Calico | Disable node mesh (legacy)
command
:
"
{{
bin_dir
}}/calicoctl
config
set
nodeToNodeMesh
off"
run_once
:
yes
when
:
-
calico_version_on_server.stdout|version_compare('v3.0.0', '<')
-
not calico_upgrade_enabled
-
nodeToMeshEnabled|default(True)
run_once
:
true
-
name
:
Calico | Configure peering with router(s)
-
name
:
Calico | Configure peering with router(s)
shell
:
>
shell
:
>
...
...
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