summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Osborne <djosborne10@gmail.com>2017-08-29 10:15:41 -0700
committerDan Osborne <djosborne10@gmail.com>2017-08-29 10:15:41 -0700
commit4e84cf6dee8e84156725f35b9b4b9775f7883eb5 (patch)
tree3084178e84b1b8d12c1f480f5e4bdb68a39fcc5c
parent60d544846d049b85539e7b2ea91a7aee00eb15a0 (diff)
downloadopenshift-4e84cf6dee8e84156725f35b9b4b9775f7883eb5.tar.gz
openshift-4e84cf6dee8e84156725f35b9b4b9775f7883eb5.tar.bz2
openshift-4e84cf6dee8e84156725f35b9b4b9775f7883eb5.tar.xz
openshift-4e84cf6dee8e84156725f35b9b4b9775f7883eb5.zip
Update calico to v2.5
-rw-r--r--roles/calico/defaults/main.yaml2
-rw-r--r--roles/calico_master/defaults/main.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml
index b1907f8cb..be73e8a73 100644
--- a/roles/calico/defaults/main.yaml
+++ b/roles/calico/defaults/main.yaml
@@ -11,4 +11,4 @@ calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/
calico_ipv4pool_ipip: "always"
calico_log_dir: "/var/log/calico"
-calico_node_image: "calico/node:v2.4.1"
+calico_node_image: "calico/node:v2.5.0"
diff --git a/roles/calico_master/defaults/main.yaml b/roles/calico_master/defaults/main.yaml
index d40286aba..01a2b9529 100644
--- a/roles/calico_master/defaults/main.yaml
+++ b/roles/calico_master/defaults/main.yaml
@@ -3,5 +3,5 @@ kubeconfig: "{{ openshift.common.config_base }}/master/openshift-master.kubeconf
calicoctl_bin_dir: "/usr/local/bin/"
-calico_url_calicoctl: "https://github.com/projectcalico/calicoctl/releases/download/v1.4.0/calicoctl"
+calico_url_calicoctl: "https://github.com/projectcalico/calicoctl/releases/download/v1.5.0/calicoctl"
calico_url_policy_controller: "quay.io/calico/kube-policy-controller:v0.7.0"