diff options
| author | Dan Osborne <djosborne10@gmail.com> | 2017-08-07 16:18:13 -0700 |
|---|---|---|
| committer | Dan Osborne <djosborne10@gmail.com> | 2017-08-08 18:44:33 -0700 |
| commit | 1284510b760e280331053b2033f2e14be437d53d (patch) | |
| tree | 82ed08c43bfc0dbea22ee331822cdc3bd33bed61 /roles | |
| parent | 085e3eb2408cb89d82bec0e37f71a255667496ec (diff) | |
| download | openshift-1284510b760e280331053b2033f2e14be437d53d.tar.gz openshift-1284510b760e280331053b2033f2e14be437d53d.tar.bz2 openshift-1284510b760e280331053b2033f2e14be437d53d.tar.xz openshift-1284510b760e280331053b2033f2e14be437d53d.zip | |
Bump calico to v2.4.1
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/calico/defaults/main.yaml | 6 | ||||
| -rw-r--r-- | roles/calico_master/defaults/main.yaml | 4 |
2 files changed, 5 insertions, 5 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" diff --git a/roles/calico_master/defaults/main.yaml b/roles/calico_master/defaults/main.yaml index b2df0105f..d40286aba 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.1.3/calicoctl" -calico_url_policy_controller: "quay.io/calico/kube-policy-controller:v0.5.4" +calico_url_calicoctl: "https://github.com/projectcalico/calicoctl/releases/download/v1.4.0/calicoctl" +calico_url_policy_controller: "quay.io/calico/kube-policy-controller:v0.7.0" |