Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
小 白蛋
Kubespray
Commits
18efdc2c
Unverified
Commit
18efdc2c
authored
2 years ago
by
Ho Kim
Committed by
GitHub
2 years ago
Browse files
Options
Download
Email Patches
Plain Diff
Fix typos in calico (#9327)
parent
6dff3934
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
docs/calico.md
+1
-1
docs/calico.md
roles/network_plugin/calico/rr/tasks/update-node.yml
+2
-2
roles/network_plugin/calico/rr/tasks/update-node.yml
roles/network_plugin/calico/tasks/peer_with_calico_rr.yml
+4
-4
roles/network_plugin/calico/tasks/peer_with_calico_rr.yml
with
7 additions
and
7 deletions
+7
-7
docs/calico.md
+
1
-
1
View file @
18efdc2c
...
...
@@ -176,7 +176,7 @@ node5
[rack0:vars]
cluster_id
=
"1.0.0.1"
cal
c
io_rr_id
=
rr1
cali
c
o_rr_id
=
rr1
calico_group_id
=
rr1
```
...
...
This diff is collapsed.
Click to expand it.
roles/network_plugin/calico/rr/tasks/update-node.yml
+
2
-
2
View file @
18efdc2c
...
...
@@ -7,13 +7,13 @@
retry_count
:
"
{{
0
if
retry_count
is
undefined
else
retry_count|int
+
1
}}"
-
name
:
Calico | Set label for route reflector
# noqa 301 305
shell
:
"
{{
bin_dir
}}/calicoctl.sh
label
node
{{
inventory_hostname
}}
calico-rr-id={{
cal
c
io_rr_id
}}
--overwrite"
shell
:
"
{{
bin_dir
}}/calicoctl.sh
label
node
{{
inventory_hostname
}}
calico-rr-id={{
cali
c
o_rr_id
}}
--overwrite"
changed_when
:
false
register
:
calico_rr_id_label
until
:
calico_rr_id_label is succeeded
delay
:
"
{{
retry_stagger
|
random
+
3
}}"
retries
:
10
when
:
cal
c
io_rr_id is defined
when
:
cali
c
o_rr_id is defined
-
name
:
Calico-rr | Fetch current node object
command
:
"
{{
bin_dir
}}/calicoctl.sh
get
node
{{
inventory_hostname
}}
-ojson"
...
...
This diff is collapsed.
Click to expand it.
roles/network_plugin/calico/tasks/peer_with_calico_rr.yml
+
4
-
4
View file @
18efdc2c
...
...
@@ -19,10 +19,10 @@
{"apiVersion": "projectcalico.org/v3",
"kind": "BGPPeer",
"metadata": {
"name": "{{ cal
c
io_rr_id }}-to-node"
"name": "{{ cali
c
o_rr_id }}-to-node"
},
"spec": {
"peerSelector": "calico-rr-id == '{{ cal
c
io_rr_id }}'",
"peerSelector": "calico-rr-id == '{{ cali
c
o_rr_id }}'",
"nodeSelector": "calico-group-id == '{{ calico_group_id }}'"
}}
register
:
output
...
...
@@ -30,7 +30,7 @@
until
:
output.rc ==
0
delay
:
"
{{
retry_stagger
|
random
+
3
}}"
when
:
-
cal
c
io_rr_id is defined
-
cali
c
o_rr_id is defined
-
calico_group_id is defined
-
inventory_hostname in groups['calico_rr']
...
...
@@ -58,7 +58,7 @@
-
"
{{
groups['calico_rr']
|
default([])
}}"
when
:
-
inventory_hostname == groups['kube_control_plane'][0]
-
cal
c
io_rr_id is not defined or calico_group_id is not defined
-
cali
c
o_rr_id is not defined or calico_group_id is not defined
-
name
:
Calico | Configure route reflectors to peer with each other
command
:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment