summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-30 16:47:45 -0400
committerGitHub <noreply@github.com>2017-08-30 16:47:45 -0400
commitda922a68d39dceb6a5c9b39e81148e92e7cd2bda (patch)
tree60ac62af924917835a3dbd64d1758adc9fbdd6dc
parent46c8551c443882435f6a7cea8e020af4e2f68481 (diff)
parent4e84cf6dee8e84156725f35b9b4b9775f7883eb5 (diff)
downloadopenshift-da922a68d39dceb6a5c9b39e81148e92e7cd2bda.tar.gz
openshift-da922a68d39dceb6a5c9b39e81148e92e7cd2bda.tar.bz2
openshift-da922a68d39dceb6a5c9b39e81148e92e7cd2bda.tar.xz
openshift-da922a68d39dceb6a5c9b39e81148e92e7cd2bda.zip
Merge pull request #5258 from ozdanborne/update-calico
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"