Skip to content

Commit 9fa1bed

Browse files
committed
Fix repeated image handling in GetImagesFromApplication function
1 parent 81edff0 commit 9fa1bed

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
@@ -490,13 +490,14 @@ func GetImagesFromApplication(app *v1alpha1.Application) image.ContainerImageLis
490490
appImgs := make(map[string]*image.ContainerImage, len(app.Status.Summary.Images))
491491
for _, imageStr := range app.Status.Summary.Images {
492492
img := image.NewFromIdentifier(imageStr)
493-
appImgs[img.ImageName] = img
493+
appImgs[img.GetFullNameWithoutTag()] = img
494494
}
495495

496496
for _, img := range *imagesFromAnnotations {
497-
if appImg, ok := appImgs[img.ImageName]; ok {
498-
appImg.ImageAlias = img.ImageAlias
499-
images = append(images, appImg)
497+
if appImg, ok := appImgs[img.GetFullNameWithoutTag()]; ok {
498+
i := *appImg
499+
i.ImageAlias = img.ImageAlias
500+
images = append(images, &i)
500501
}
501502
}
502503

0 commit comments

Comments
 (0)