Stop setting original image annotation on auto-upgrade apps (#1774) (#…

…1953) Signed-off-by: Grant Linville <[email protected]>
acorn-io · Jul 20, 2023 · 2008864 · 2008864
1 parent 4bf05b4
commit 2008864
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/pkg/controller/appdefinition/acorn.go b/pkg/controller/appdefinition/acorn.go
@@ -127,10 +127,7 @@ func toAcorn(appInstance *v1.AppInstance, tag name.Reference, pullSecrets *PullS
 			Namespace: appInstance.Namespace,
 			Labels:    labelMap,
 			Annotations: labels.Merge(appInstanceScoped(acornName, appInstance.Status.AppSpec.Annotations, appInstance.Spec.Annotations, acorn.Annotations),
-				map[string]string{
-					labels.AcornOriginalImage: acorn.GetOriginalImage(),
-					labels.AcornAppGeneration: strconv.FormatInt(appInstance.Generation, 10),
-				}),
+				map[string]string{labels.AcornAppGeneration: strconv.FormatInt(appInstance.Generation, 10)}),
 		},
 		Spec: v1.AppInstanceSpec{
 			Region:              appInstance.GetRegion(),
@@ -153,6 +150,12 @@ func toAcorn(appInstance *v1.AppInstance, tag name.Reference, pullSecrets *PullS
 		},
 	}
 
+	// Only set the original image annotation if auto-upgrade is off. Setting the original image annotation
+	// on auto-upgrade apps will cause the pattern to be shown to the user instead of the actual image, which is bad.
+	if _, on := autoupgrade.Mode(acornInstance.Spec); !on {
+		acornInstance.Annotations[labels.AcornOriginalImage] = acorn.GetOriginalImage()
+	}
+
 	return acornInstance
 }
 

diff --git a/pkg/controller/appdefinition/testdata/acorn/basic/expected.golden b/pkg/controller/appdefinition/testdata/acorn/basic/expected.golden
@@ -55,7 +55,6 @@ kind: AppInstance
 metadata:
   annotations:
     acorn.io/app-generation: "0"
-    acorn.io/original-image: foo
     myAnnotation: myValue
   creationTimestamp: null
   labels: