Matthew Mosesohn
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
3 additions and
3 deletions
-
roles/network_plugin/calico/tasks/install.yml
|
|
|
@ -101,7 +101,7 @@ |
|
|
|
run_once: true |
|
|
|
delegate_to: "{{ groups['kube-master'][0] }}" |
|
|
|
when: |
|
|
|
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') |
|
|
|
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') |
|
|
|
- 'calico_conf.stdout == "0"' |
|
|
|
|
|
|
|
- name: Calico | Configure calico network pool (legacy) |
|
|
|
@ -180,7 +180,7 @@ |
|
|
|
with_items: |
|
|
|
- "{{ peers|default([]) }}" |
|
|
|
when: |
|
|
|
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') |
|
|
|
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') |
|
|
|
- peer_with_router|default(false) |
|
|
|
- inventory_hostname in groups['k8s-cluster'] |
|
|
|
|
|
|
|
@ -221,7 +221,7 @@ |
|
|
|
with_items: |
|
|
|
- "{{ groups['calico-rr'] | default([]) }}" |
|
|
|
when: |
|
|
|
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') |
|
|
|
- calico_upgrade_enabled or calico_version_on_server.stdout|version_compare('v3.0.0', '>') |
|
|
|
- peer_with_calico_rr|default(false) |
|
|
|
- inventory_hostname in groups['k8s-cluster'] |
|
|
|
- hostvars[item]['cluster_id'] == cluster_id |
|
|
|
|
