Skip to content

Commit 077148b

Browse files
committed
Fix repeated image handling in GetImagesFromApplication function
Signed-off-by: Aleksandr Petrov <burnb83@gmail.com>
1 parent 18faa8c commit 077148b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/argocd/argocd.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -487,13 +487,14 @@ func GetImagesFromApplication(app *v1alpha1.Application) image.ContainerImageLis
487487
appImgs := make(map[string]*image.ContainerImage, len(app.Status.Summary.Images))
488488
for _, imageStr := range app.Status.Summary.Images {
489489
img := image.NewFromIdentifier(imageStr)
490-
appImgs[img.ImageName] = img
490+
appImgs[img.GetFullNameWithoutTag()] = img
491491
}
492492

493493
for _, img := range *imagesFromAnnotations {
494-
if appImg, ok := appImgs[img.ImageName]; ok {
495-
appImg.ImageAlias = img.ImageAlias
496-
images = append(images, appImg)
494+
if appImg, ok := appImgs[img.GetFullNameWithoutTag()]; ok {
495+
i := *appImg
496+
i.ImageAlias = img.ImageAlias
497+
images = append(images, &i)
497498
}
498499
}
499500

0 commit comments

Comments
 (0)