add support for Calico BGPPeer sourceAddress

kubernetes-sigs · Dec 15, 2021 · 929d372 · 929d372
1 parent 4daa824
commit 929d372
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/docs/calico_peer_example/new-york.yml b/docs/calico_peer_example/new-york.yml
@@ -2,8 +2,10 @@
 # peers:
 #   - router_id: "10.99.0.34"
 #     as: "65xxx"
+#     sourceaddress: "None"
 #   - router_id: "10.99.0.35"
 #     as: "65xxx"
+#     sourceaddress: "None"
 
 # loadbalancer_apiserver:
 #   address: "10.99.0.44"

diff --git a/docs/calico_peer_example/paris.yml b/docs/calico_peer_example/paris.yml
@@ -2,8 +2,10 @@
 # peers:
 #   - router_id: "10.99.0.2"
 #     as: "65xxx"
+#     sourceaddress: "None"
 #   - router_id: "10.99.0.3"
 #     as: "65xxx"
+#     sourceaddress: "None"
 
 # loadbalancer_apiserver:
 #   address: "10.99.0.21"

diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
@@ -418,7 +418,8 @@
       "spec": {
         "asNumber": "{{ item.as }}",
         "node": "{{ inventory_hostname }}",
-        "peerIP": "{{ item.router_id }}"
+        "peerIP": "{{ item.router_id }}",
+        "sourceAddress": "{{ item.sourceaddress|default('UseNodeIP') }}"
       }}
   register: output
   retries: 4