fixed support for image aliases

Signed-off-by: Aleksandr Petrov <[email protected]>

Author: burnb

pkg/argocd/argocd.go

@@ -494,9 +494,13 @@ func GetImagesFromApplication(app *v1alpha1.Application) image.ContainerImageLis
 	annotations := app.Annotations
 	imagesFromAnnotations := parseImageList(annotations)
 
+	appImgs := make(image.ContainerImageList, 0, len(app.Status.Summary.Images))
 	for _, imageStr := range app.Status.Summary.Images {
-		img := image.NewFromIdentifier(imageStr)
-		if ImageIsAllowed(img, imagesFromAnnotations) {
+		appImgs = append(appImgs, image.NewFromIdentifier(imageStr))
+	}
+
+	for _, img := range *imagesFromAnnotations {
+		if ImageIsAllowed(img, &appImgs) {
 			images = append(images, img)
 		}
 	}

pkg/argocd/update.go

@@ -419,18 +419,16 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
 			images := GetImagesAndAliasesFromApplication(app)
 
 			for _, c := range images {
-
-				if c.ImageAlias == "" {
-					continue
+				image := c.ImageAlias
+				if image == "" {
+					image = c.ImageName
 				}
-
-				helmAnnotationParamName, helmAnnotationParamVersion := getHelmParamNamesFromAnnotation(app.Annotations, c)
-
+				helmAnnotationParamName, helmAnnotationParamVersion := getHelmParamNamesFromAnnotation(app.Annotations, image)
 				if helmAnnotationParamName == "" {
-					return nil, fmt.Errorf("could not find an image-name annotation for image %s", c.ImageName)
+					return nil, fmt.Errorf("could not find an image-name annotation for image %s", image)
 				}
 				if helmAnnotationParamVersion == "" {
-					return nil, fmt.Errorf("could not find an image-tag annotation for image %s", c.ImageName)
+					return nil, fmt.Errorf("could not find an image-tag annotation for image %s", image)
 				}
 
 				helmParamName := getHelmParam(appSource.Helm.Parameters, helmAnnotationParamName)