From 15363530ae113a8ec0614fc180fa0a8450871024 Mon Sep 17 00:00:00 2001 From: Antoine Legrand <2t.antoine@gmail.com> Date: Wed, 5 Sep 2018 11:44:32 +0200 Subject: [PATCH] Reverts calico update to 3.2.0, fixes #3223 --- roles/download/defaults/main.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 35f1a8dc4..aabba0a14 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -35,10 +35,10 @@ kubeadm_version: "{{ kube_version }}" etcd_version: v3.2.18 # TODO(mattymo): Move calico versions to roles/network_plugins/calico/defaults # after migration to container download -calico_version: "v3.2.0" -calico_ctl_version: "v3.2.0" -calico_cni_version: "v3.2.0" -calico_policy_version: "v3.2.0" +calico_version: "v3.1.3" +calico_ctl_version: "v3.1.3" +calico_cni_version: "v3.1.3" +calico_policy_version: "v3.1.3" calico_rr_version: "v0.6.1" flannel_version: "v0.10.0" flannel_cni_version: "v0.3.0" @@ -68,13 +68,13 @@ flannel_image_tag: "{{ flannel_version }}" flannel_cni_image_repo: "quay.io/coreos/flannel-cni" flannel_cni_image_tag: "{{ flannel_cni_version }}" calicoctl_image_repo: "quay.io/calico/ctl" -calicoctl_image_tag: "{{ calico_ctl_version }}-{{ image_arch }}" +calicoctl_image_tag: "{{ calico_ctl_version }}" calico_node_image_repo: "quay.io/calico/node" -calico_node_image_tag: "{{ calico_version }}-{{ image_arch }}" +calico_node_image_tag: "{{ calico_version }}" calico_cni_image_repo: "quay.io/calico/cni" -calico_cni_image_tag: "{{ calico_cni_version }}-{{ image_arch }}" +calico_cni_image_tag: "{{ calico_cni_version }}" calico_policy_image_repo: "quay.io/calico/kube-controllers" -calico_policy_image_tag: "{{ calico_policy_version }}-{{ image_arch }}" +calico_policy_image_tag: "{{ calico_policy_version }}" calico_rr_image_repo: "quay.io/calico/routereflector" calico_rr_image_tag: "{{ calico_rr_version }}" hyperkube_image_repo: "gcr.io/google-containers/hyperkube-{{ image_arch }}"