From 58faef6ff6b8002a590cf5cb8b898f08b740920f Mon Sep 17 00:00:00 2001
From: Fred Rolland <frolland@nvidia.com>
Date: Thu, 3 Nov 2022 11:41:36 +0200
Subject: [PATCH] Flannel: fix init container image arch (#9461)

The install-cni-plugin image was not updated to the corresponding
arch when building the different DS.

Fixes issue #9460

Signed-off-by: Fred Rolland <frolland@nvidia.com>

Signed-off-by: Fred Rolland <frolland@nvidia.com>
---
 roles/network_plugin/flannel/templates/cni-flannel.yml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2 b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
index fb6f5bf88..819061119 100644
--- a/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
+++ b/roles/network_plugin/flannel/templates/cni-flannel.yml.j2
@@ -114,7 +114,7 @@ spec:
                       - {{ arch }}
       initContainers:
       - name: install-cni-plugin
-        image: {{ flannel_init_image_repo }}:{{ flannel_init_image_tag }}
+        image: {{ flannel_init_image_repo }}:{{ flannel_init_image_tag | regex_replace(image_arch,'') }}{{ arch }}
         command:
         - cp
         args: