From 63cbe322930610a563919ca1fc4b372906bbeb3c Mon Sep 17 00:00:00 2001
From: Alasdair Tran <alasdair.tran@gmail.com>
Date: Sun, 18 Jun 2023 12:51:41 +0000
Subject: [PATCH] Remap all init container images of etcd-manager

---
 pkg/model/components/etcdmanager/model.go | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkg/model/components/etcdmanager/model.go b/pkg/model/components/etcdmanager/model.go
index 41cc5ac552..2cebede7fb 100644
--- a/pkg/model/components/etcdmanager/model.go
+++ b/pkg/model/components/etcdmanager/model.go
@@ -273,14 +273,17 @@ func (b *EtcdManagerBuilder) buildPod(etcdCluster kops.EtcdClusterSpec, instance
 					},
 				},
 			}
-			// Remap image via AssetBuilder
-			remapped, err := b.AssetBuilder.RemapImage(initContainer.Image)
-			if err != nil {
-				return nil, fmt.Errorf("unable to remap container image %q: %w", initContainer.Image, err)
-			}
-			initContainer.Image = remapped
 			pod.Spec.InitContainers = append(pod.Spec.InitContainers, initContainer)
 		}
+
+		// Remap all init container images via AssetBuilder
+		for i, container := range pod.Spec.InitContainers {
+			remapped, err := b.AssetBuilder.RemapImage(container.Image)
+			if err != nil {
+				return nil, fmt.Errorf("unable to remap init container image %q: %w", container.Image, err)
+			}
+			pod.Spec.InitContainers[i].Image = remapped
+		}
 	}
 
 	{