From a374301570fe38f7b928a4c23f4f727919880ccb Mon Sep 17 00:00:00 2001
From: Victor Morales <v.morales@samsung.com>
Date: Wed, 30 Sep 2020 14:16:54 -0700
Subject: [PATCH] Remove arch from flannel image tag (#6765)
The 0d0cc8cf9cbc3e1a2a16f182dfca72dda6c78117 change creates several
DaemonSets to cover the Flannel CNI installation for different CPU
architectures. This change removes the unnecessary architecture value
from the docker tag value.
Signed-off-by: Victor Morales <v.morales@samsung.com>
---
roles/download/defaults/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 1d62d969b..3fa879605 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -388,7 +388,7 @@ kube_proxy_image_repo: "{{ kube_image_repo }}/kube-proxy"
etcd_image_repo: "{{ quay_image_repo }}/coreos/etcd"
etcd_image_tag: "{{ etcd_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}"
flannel_image_repo: "{{ quay_image_repo }}/coreos/flannel"
-flannel_image_tag: "{{ flannel_version }}{%- if image_arch != 'amd64' -%}-{{ image_arch }}{%- endif -%}"
+flannel_image_tag: "{{ flannel_version }}"
calico_node_image_repo: "{{ docker_image_repo }}/calico/node"
calico_node_image_tag: "{{ calico_version }}"
calico_cni_image_repo: "{{ docker_image_repo }}/calico/cni"
--
GitLab