summaryrefslogtreecommitdiffstats
path: root/roles/calico/defaults/main.yaml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-14 22:52:09 -0400
committerGitHub <noreply@github.com>2017-08-14 22:52:09 -0400
commit2bc68321f54ed405819d168a4930c75d9ab8fadc (patch)
tree48c713a2c0ad9dc05eca0c2311f6eab37ee546db /roles/calico/defaults/main.yaml
parentd5fc93e7e32872e0903d83f1be08999a3f7ccca9 (diff)
parent917015b0473a1fb9a0488ebec2765460e7bf3667 (diff)
downloadopenshift-2bc68321f54ed405819d168a4930c75d9ab8fadc.tar.gz
openshift-2bc68321f54ed405819d168a4930c75d9ab8fadc.tar.bz2
openshift-2bc68321f54ed405819d168a4930c75d9ab8fadc.tar.xz
openshift-2bc68321f54ed405819d168a4930c75d9ab8fadc.zip
Merge pull request #5037 from ozdanborne/calico-2.4
Bump Calico to v2.4.1
Diffstat (limited to 'roles/calico/defaults/main.yaml')
-rw-r--r--roles/calico/defaults/main.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/roles/calico/defaults/main.yaml b/roles/calico/defaults/main.yaml
index 207dee068..e7a9db92f 100644
--- a/roles/calico/defaults/main.yaml
+++ b/roles/calico/defaults/main.yaml
@@ -5,11 +5,11 @@ cni_conf_dir: "/etc/cni/net.d/"
cni_bin_dir: "/opt/cni/bin/"
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.8.3/calico"
-calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.8.3/calico-ipam"
+calico_url_cni: "https://github.com/projectcalico/cni-plugin/releases/download/v1.10.0/calico"
+calico_url_ipam: "https://github.com/projectcalico/cni-plugin/releases/download/v1.10.0/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.2.1"
+calico_node_image: "calico/node:v2.4.1"