C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix calico-rr peering with k8s masters

Browse source 
Calico-rr is broken for deployments with separate k8s-master and
k8s-node roles. In order to fix it we should peer k8s-cluster
nodes with calico-rr, not just k8s-node. The same for peering
with routers.

Closes #925
This commit is contained in:
Aleksandr Didenko 2017-01-20 11:38:57 +01:00
parent 1bdf34e7dc
commit f05aaeb329
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
roles/network_plugin/calico/tasks/main.yml
View file

@ -193,7 +193,7 @@
- name: Calico | Disable node mesh - name: Calico | Disable node mesh
shell: "{{ bin_dir }}/calicoctl config set nodeToNodeMesh off" shell: "{{ bin_dir }}/calicoctl config set nodeToNodeMesh off"
when: ((peer_with_router|default(false) or peer_with_calico_rr|default(false)) when: ((peer_with_router|default(false) or peer_with_calico_rr|default(false))
and inventory_hostname in groups['kube-node'] and inventory_hostname in groups['k8s-cluster']
and not legacy_calicoctl) and not legacy_calicoctl)
run_once: true run_once: true
@ -208,7 +208,7 @@
| {{ bin_dir }}/calicoctl create -f - | {{ bin_dir }}/calicoctl create -f -
with_items: "{{ peers|default([]) }}" with_items: "{{ peers|default([]) }}"
when: (not legacy_calicoctl and when: (not legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['kube-node']) peer_with_router|default(false) and inventory_hostname in groups['k8s-cluster'])
- name: Calico | Configure peering with route reflectors - name: Calico | Configure peering with route reflectors
shell: > shell: >
@ -223,13 +223,13 @@
| {{ bin_dir }}/calicoctl create --skip-exists -f - | {{ bin_dir }}/calicoctl create --skip-exists -f -
with_items: "{{ groups['calico-rr'] | default([]) }}" with_items: "{{ groups['calico-rr'] | default([]) }}"
when: (not legacy_calicoctl and when: (not legacy_calicoctl and
peer_with_calico_rr|default(false) and inventory_hostname in groups['kube-node'] peer_with_calico_rr|default(false) and inventory_hostname in groups['k8s-cluster']
and hostvars[item]['cluster_id'] == cluster_id) and hostvars[item]['cluster_id'] == cluster_id)
- name: Calico (old) | Disable node mesh - name: Calico (old) | Disable node mesh
shell: "{{ bin_dir }}/calicoctl bgp node-mesh off" shell: "{{ bin_dir }}/calicoctl bgp node-mesh off"
when: ((peer_with_router|default(false) or peer_with_calico_rr|default(false)) when: ((peer_with_router|default(false) or peer_with_calico_rr|default(false))
and inventory_hostname in groups['kube-node'] and inventory_hostname in groups['k8s-cluster']
and legacy_calicoctl) and legacy_calicoctl)
run_once: true run_once: true
@ -237,11 +237,11 @@
shell: "{{ bin_dir }}/calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}" shell: "{{ bin_dir }}/calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}"
with_items: "{{ peers|default([]) }}" with_items: "{{ peers|default([]) }}"
when: (legacy_calicoctl and when: (legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['kube-node']) peer_with_router|default(false) and inventory_hostname in groups['k8s-cluster'])
- name: Calico (old) | Configure peering with route reflectors - name: Calico (old) | Configure peering with route reflectors
shell: "{{ bin_dir }}/calicoctl node bgp peer add {{ hostvars[item]['calico_rr_ip']|default(hostvars[item]['ip']) }} as {{ local_as | default(global_as_num) }}" shell: "{{ bin_dir }}/calicoctl node bgp peer add {{ hostvars[item]['calico_rr_ip']|default(hostvars[item]['ip']) }} as {{ local_as | default(global_as_num) }}"
with_items: "{{ groups['calico-rr'] | default([]) }}" with_items: "{{ groups['calico-rr'] | default([]) }}"
when: (legacy_calicoctl and when: (legacy_calicoctl and
peer_with_calico_rr|default(false) and inventory_hostname in groups['kube-node'] peer_with_calico_rr|default(false) and inventory_hostname in groups['k8s-cluster']
and hostvars[item]['cluster_id'] == cluster_id) and hostvars[item]['cluster_id'] == cluster_id)