From bce1c62308605d4a3fd673597584e98cb18dddc8 Mon Sep 17 00:00:00 2001
From: Brad Beam <brad.beam@b-rad.info>
Date: Tue, 11 Apr 2017 20:52:04 -0500
Subject: [PATCH] Updating calico versions
---
roles/download/defaults/main.yml | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index e64845460..2f5c8358a 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -22,8 +22,8 @@ kube_version: v1.6.1
etcd_version: v3.0.17
#TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults
# after migration to container download
-calico_version: "v1.1.0-rc8"
-calico_cni_version: "v1.5.6"
+calico_version: "v1.1.0"
+calico_cni_version: "v1.6.2"
calico_policy_version: "v0.5.4"
weave_version: 1.8.2
flannel_version: v0.6.2
@@ -50,10 +50,8 @@ calico_cni_image_repo: "calico/cni"
calico_cni_image_tag: "{{ calico_cni_version }}"
calico_policy_image_repo: "calico/kube-policy-controller"
calico_policy_image_tag: "{{ calico_policy_version }}"
-# TODO(adidenko): switch to "calico/routereflector" when
-# https://github.com/projectcalico/calico-bird/pull/27 is merged
-calico_rr_image_repo: "quay.io/l23network/routereflector"
-calico_rr_image_tag: "v0.1"
+calico_rr_image_repo: "quay.io/calico/routereflector"
+calico_rr_image_tag: "v0.3.0"
exechealthz_version: 1.1
exechealthz_image_repo: "gcr.io/google_containers/exechealthz-amd64"
exechealthz_image_tag: "{{ exechealthz_version }}"
--
GitLab