Normalize the hardcoded images used for warmpool pre-pulling

rifelpet · rifelpet · commit 172ea413e0b1 · 2024-12-16T23:14:50.000-06:00
diff --git a/pkg/nodemodel/nodeupconfigbuilder.go b/pkg/nodemodel/nodeupconfigbuilder.go
@@ -509,7 +509,8 @@ func (n *nodeUpConfigBuilder) buildWarmPoolImages(ig *kops.InstanceGroup) []stri
 	if assetBuilder != nil {
 		for _, image := range assetBuilder.ImageAssets {
 			for _, prefix := range desiredImagePrefixes {
-				if strings.HasPrefix(image.DownloadLocation, prefix) {
+				remappedPrefix := assets.NormalizeImage(assetBuilder, prefix)
+				if strings.HasPrefix(image.DownloadLocation, remappedPrefix) {
 					images[image.DownloadLocation] = true
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,8 @@ func (n nodeUpConfigBuilder) buildWarmPoolImages(ig kops.InstanceGroup) []stri`
`509`	`509`	`if assetBuilder != nil {`
`510`	`510`	`for _, image := range assetBuilder.ImageAssets {`
`511`	`511`	`for _, prefix := range desiredImagePrefixes {`
`512`		`- if strings.HasPrefix(image.DownloadLocation, prefix) {`
	`512`	`+ remappedPrefix := assets.NormalizeImage(assetBuilder, prefix)`
	`513`	`+ if strings.HasPrefix(image.DownloadLocation, remappedPrefix) {`
`513`	`514`	`images[image.DownloadLocation] = true`
`514`	`515`	`}`
`515`	`516`	`}`