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

Merge pull request #1222 from bradbeam/calico

Browse source 
Updating calico versions
This commit is contained in:
Matthew Mosesohn 2017-04-17 12:52:20 +03:00 committed by GitHub
commit 138b593d33
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
roles/download/defaults/main.yml
View file

@ -22,8 +22,8 @@ kube_version: v1.6.1
etcd_version: v3.0.17 etcd_version: v3.0.17
#TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults #TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download # after migration to container download
calico_version: "v1.1.0-rc8" calico_version: "v1.1.0"
calico_cni_version: "v1.5.6" calico_cni_version: "v1.6.2"
calico_policy_version: "v0.5.4" calico_policy_version: "v0.5.4"
weave_version: 1.8.2 weave_version: 1.8.2
flannel_version: v0.6.2 flannel_version: v0.6.2
@ -50,10 +50,8 @@ calico_cni_image_repo: "calico/cni"
calico_cni_image_tag: "{{ calico_cni_version }}" calico_cni_image_tag: "{{ calico_cni_version }}"
calico_policy_image_repo: "calico/kube-policy-controller" calico_policy_image_repo: "calico/kube-policy-controller"
calico_policy_image_tag: "{{ calico_policy_version }}" calico_policy_image_tag: "{{ calico_policy_version }}"
# TODO(adidenko): switch to "calico/routereflector" when calico_rr_image_repo: "quay.io/calico/routereflector"
# https://github.com/projectcalico/calico-bird/pull/27 is merged calico_rr_image_tag: "v0.3.0"
calico_rr_image_repo: "quay.io/l23network/routereflector"
calico_rr_image_tag: "v0.1"
exechealthz_version: 1.1 exechealthz_version: 1.1
exechealthz_image_repo: "gcr.io/google_containers/exechealthz-amd64" exechealthz_image_repo: "gcr.io/google_containers/exechealthz-amd64"
exechealthz_image_tag: "{{ exechealthz_version }}" exechealthz_image_tag: "{{ exechealthz_version }}"