From adca353fe976bab8aee08dbbaa690fa07eee8b98 Mon Sep 17 00:00:00 2001
From: Maxime Guyot <Miouge1@users.noreply.github.com>
Date: Thu, 4 Apr 2019 11:20:49 +0300
Subject: [PATCH] Use docker.io for calico (#4253)

---
 roles/download/defaults/main.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 2689e889c..1d94dcf34 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -158,16 +158,16 @@ flannel_image_repo: "quay.io/coreos/flannel"
 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 }}"
-calico_node_image_repo: "quay.io/calico/node"
-calico_node_image_tag: "{{ calico_version }}-{{ image_arch }}"
-calico_cni_image_repo: "quay.io/calico/cni"
-calico_cni_image_tag: "{{ calico_cni_version }}-{{ image_arch }}"
-calico_policy_image_repo: "quay.io/calico/kube-controllers"
-calico_policy_image_tag: "{{ calico_policy_version }}-{{ image_arch }}"
-calico_rr_image_repo: "quay.io/calico/routereflector"
-calico_rr_image_tag: "{{ calico_rr_version }}-{{ image_arch }}"
+calicoctl_image_repo: "docker.io/calico/ctl"
+calicoctl_image_tag: "{{ calico_ctl_version }}"
+calico_node_image_repo: "docker.io/calico/node"
+calico_node_image_tag: "{{ calico_version }}"
+calico_cni_image_repo: "docker.io/calico/cni"
+calico_cni_image_tag: "{{ calico_cni_version }}"
+calico_policy_image_repo: "docker.io/calico/kube-controllers"
+calico_policy_image_tag: "{{ calico_policy_version }}"
+calico_rr_image_repo: "docker.io/calico/routereflector"
+calico_rr_image_tag: "{{ calico_rr_version }}"
 pod_infra_image_repo: "gcr.io/google_containers/pause-{{ image_arch }}"
 pod_infra_image_tag: "{{ pod_infra_version }}"
 install_socat_image_repo: "xueshanf/install-socat"
-- 
GitLab