summaryrefslogtreecommitdiffstats
path: root/roles/calico
diff options
context:
space:
mode:
authorVincent Schwarzer <vincent.schwarzer@yahoo.de>2017-05-26 13:09:41 +0200
committerVincent Schwarzer <vincent.schwarzer@yahoo.de>2017-06-13 15:54:05 +0200
commit4dcd01577bc6f92ef6f1f294c4374a14e0895b96 (patch)
tree48b1f0a95ae79888636d7183e1aad44a114f0fc3 /roles/calico
parent8603fb127a9e871e491362ad550377971b8d4979 (diff)
downloadopenshift-4dcd01577bc6f92ef6f1f294c4374a14e0895b96.tar.gz
openshift-4dcd01577bc6f92ef6f1f294c4374a14e0895b96.tar.bz2
openshift-4dcd01577bc6f92ef6f1f294c4374a14e0895b96.tar.xz
openshift-4dcd01577bc6f92ef6f1f294c4374a14e0895b96.zip
Upgraded Calico to 2.2.1 Release
Diffstat (limited to 'roles/calico')
-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"