From 18efdc2c51c5881c8647c06d02f8b505c5712876 Mon Sep 17 00:00:00 2001
From: Ho Kim <ho.kim@ulagbulag.io>
Date: Mon, 26 Sep 2022 16:11:44 +0900
Subject: [PATCH] Fix typos in calico (#9327)
---
docs/calico.md | 2 +-
roles/network_plugin/calico/rr/tasks/update-node.yml | 4 ++--
roles/network_plugin/calico/tasks/peer_with_calico_rr.yml | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/docs/calico.md b/docs/calico.md
index 1473e49fb..ad1715105 100644
--- a/docs/calico.md
+++ b/docs/calico.md
@@ -176,7 +176,7 @@ node5
[rack0:vars]
cluster_id="1.0.0.1"
-calcio_rr_id=rr1
+calico_rr_id=rr1
calico_group_id=rr1
```
diff --git a/roles/network_plugin/calico/rr/tasks/update-node.yml b/roles/network_plugin/calico/rr/tasks/update-node.yml
index 970cad83a..7070076b1 100644
--- a/roles/network_plugin/calico/rr/tasks/update-node.yml
+++ b/roles/network_plugin/calico/rr/tasks/update-node.yml
@@ -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={{ calcio_rr_id }} --overwrite"
+ shell: "{{ bin_dir }}/calicoctl.sh label node {{ inventory_hostname }} calico-rr-id={{ calico_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: calcio_rr_id is defined
+ when: calico_rr_id is defined
- name: Calico-rr | Fetch current node object
command: "{{ bin_dir }}/calicoctl.sh get node {{ inventory_hostname }} -ojson"
diff --git a/roles/network_plugin/calico/tasks/peer_with_calico_rr.yml b/roles/network_plugin/calico/tasks/peer_with_calico_rr.yml
index c95924ac6..efa98c5d9 100644
--- a/roles/network_plugin/calico/tasks/peer_with_calico_rr.yml
+++ b/roles/network_plugin/calico/tasks/peer_with_calico_rr.yml
@@ -19,10 +19,10 @@
{"apiVersion": "projectcalico.org/v3",
"kind": "BGPPeer",
"metadata": {
- "name": "{{ calcio_rr_id }}-to-node"
+ "name": "{{ calico_rr_id }}-to-node"
},
"spec": {
- "peerSelector": "calico-rr-id == '{{ calcio_rr_id }}'",
+ "peerSelector": "calico-rr-id == '{{ calico_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:
- - calcio_rr_id is defined
+ - calico_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]
- - calcio_rr_id is not defined or calico_group_id is not defined
+ - calico_rr_id is not defined or calico_group_id is not defined
- name: Calico | Configure route reflectors to peer with each other
command:
--
GitLab