summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-06-14 03:42:34 -0400
committerGitHub <noreply@github.com>2017-06-14 03:42:34 -0400
commit87f505afd874b84e9ac239adc04be809d72cc5fd (patch)
tree7670f020da4b29d72f70f81f3369b0f576580557
parent8ab1f771de34c52b1c85493a0002ac12952a0ed5 (diff)
parent85a3806b57858b35b793b8391b67f88bfeec9e10 (diff)
downloadopenshift-87f505afd874b84e9ac239adc04be809d72cc5fd.tar.gz
openshift-87f505afd874b84e9ac239adc04be809d72cc5fd.tar.bz2
openshift-87f505afd874b84e9ac239adc04be809d72cc5fd.tar.xz
openshift-87f505afd874b84e9ac239adc04be809d72cc5fd.zip
Merge pull request #4296 from VincentS/Upgrade_Calico_Version_to_2.2.1
Merged by openshift-bot
-rw-r--r--roles/calico/defaults/main.yaml8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml
index c7eea46f2..207dee068 100644
--- a/roles/calico/defaults/main.yaml
+++ b/roles/calico/defaults/main.yaml
@@ -3,13 +3,13 @@ kubeconfig: "{{openshift.common.config_base}}/node/{{ 'system:node:' + openshif
cni_conf_dir: "/etc/cni/net.d/"
cni_bin_dir: "/opt/cni/bin/"
-cni_url: "https://github.com/containernetworking/cni/releases/download/v0.4.0/cni-amd64-v0.4.0.tgz"
+cni_url: "https://github.com/containernetworking/cni/releases/download/v0.5.2/cni-amd64-v0.5.2.tgz"
-calico_url_cni: "https://github.com/projectcalico/cni-plugin/releases/download/v1.5.5/calico"
-calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.5.5/calico-ipam"
+calico_url_cni: "https://github.com/projectcalico/cni-plugin/releases/download/v1.8.3/calico"
+calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.8.3/calico-ipam"
calico_ipv4pool_ipip: "always"
calico_ipv4pool_cidr: "192.168.0.0/16"
calico_log_dir: "/var/log/calico"
-calico_node_image: "calico/node:v1.1.0"
+calico_node_image: "calico/node:v1.2.1"