feat: allow empty image-name annotation

Signed-off-by: William Wang <[email protected]>

Author: will4j

pkg/argocd/update.go

@@ -499,7 +499,18 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
 				helmAnnotationParamName, helmAnnotationParamVersion := getHelmParamNamesFromAnnotation(app.Annotations, c)
 
 				if helmAnnotationParamName == "" {
-					return nil, fmt.Errorf("could not find an image-name annotation for image %s", c.ImageName)
+					// allow empty image-name
+					fmt.Sprintf("no image-name annotation found for image %s", c.ImageName)
+				} else {
+					helmParamName := getHelmParam(appSource.Helm.Parameters, helmAnnotationParamName)
+					if helmParamName == nil {
+						return nil, fmt.Errorf("%s parameter not found", helmAnnotationParamName)
+					}
+
+					err = setHelmValue(&helmNewValues, helmAnnotationParamName, helmParamName.Value)
+					if err != nil {
+						return nil, fmt.Errorf("failed to set image parameter name value: %v", err)
+					}
 				}
 				// for image-spec annotation, helmAnnotationParamName holds image-spec annotation value,
 				// and helmAnnotationParamVersion is empty
@@ -519,16 +530,6 @@ func marshalParamsOverride(app *v1alpha1.Application, originalData []byte) ([]by
 						return nil, fmt.Errorf("failed to set image parameter version value: %v", err)
 					}
 				}
-
-				helmParamName := getHelmParam(appSource.Helm.Parameters, helmAnnotationParamName)
-				if helmParamName == nil {
-					return nil, fmt.Errorf("%s parameter not found", helmAnnotationParamName)
-				}
-
-				err = setHelmValue(&helmNewValues, helmAnnotationParamName, helmParamName.Value)
-				if err != nil {
-					return nil, fmt.Errorf("failed to set image parameter name value: %v", err)
-				}
 			}
 
 			override, err = marshalWithIndent(&helmNewValues, defaultIndent)

pkg/argocd/update_test.go

@@ -1977,7 +1977,7 @@ replicas: 1
 		assert.Equal(t, "could not find an image-tag annotation for image nginx", err.Error())
 	})
 
-	t.Run("Missing annotation image-name for helmvalues write-back-target", func(t *testing.T) {
+	t.Run("Allow empty annotation image-name for helmvalues write-back-target", func(t *testing.T) {
 		app := v1alpha1.Application{
 			ObjectMeta: v1.ObjectMeta{
 				Name: "testapp",
@@ -2020,8 +2020,7 @@ replicas: 1
 
 		originalData := []byte(`random: yaml`)
 		_, err := marshalParamsOverride(&app, originalData)
-		assert.Error(t, err)
-		assert.Equal(t, "could not find an image-name annotation for image nginx", err.Error())
+		assert.NoError(t, err)
 	})
 
 	t.Run("Image-name annotation value not found in Helm source parameters list", func(t *testing.T) {