External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-05-09 02:17:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

fix for calico with kdd datastore (#4922)

Browse Source 
* fix for calico with kdd datastore

* remove AS number from daemonset

* revert changes to canal

* additionnal fixes for kdd datastore in calico
This commit is contained in:
Julian Tabel
2019-07-08 11:20:03 +02:00
committed by Matthew Mosesohn
parent 53032a6695
commit dc16ab92f4
5 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/network_plugin/calico/tasks/check.yml
View File

@@ -10,16 +10,10 @@
run_once: yes
- name: "Get current version of calico cluster version"
shell: "{{ bin_dir }}/calicoctl version | grep 'Cluster Version:' | awk '{ print $3}'"
shell: "{{ bin_dir }}/calicoctl.sh version | grep 'Cluster Version:' | awk '{ print $3}'"
register: calico_version_on_server
run_once: yes
changed_when: false
environment:
ETCD_ENDPOINTS: "{{ etcd_access_addresses }}"
ETCD_CA_CERT_FILE: "{{ calico_cert_dir }}/ca_cert.crt"
ETCD_CERT_FILE: "{{ calico_cert_dir }}/cert.crt"
ETCD_KEY_FILE: "{{ calico_cert_dir }}/key.pem"
- name: "Determine if calico upgrade is needed"
block: