diff --git a/pkg/cli/builder/table/funcs.go b/pkg/cli/builder/table/funcs.go index 0d9254e71a..b6eecc639d 100644 --- a/pkg/cli/builder/table/funcs.go +++ b/pkg/cli/builder/table/funcs.go @@ -9,6 +9,7 @@ import ( apiv1 "github.com/acorn-io/runtime/pkg/apis/api.acorn.io/v1" adminv1 "github.com/acorn-io/runtime/pkg/apis/internal.admin.acorn.io/v1" + "github.com/acorn-io/runtime/pkg/labels" "github.com/acorn-io/runtime/pkg/tags" "github.com/rancher/wrangler/pkg/data/convert" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -40,6 +41,7 @@ var ( "memoryToRange": MemoryToRange, "defaultMemory": DefaultMemory, "ownerName": OwnerReferenceName, + "imageName": ImageName, } ) @@ -292,3 +294,15 @@ func OwnerReferenceName(obj metav1.Object) string { return owners[0].Name } + +func ImageName(obj metav1.Object) string { + app, ok := obj.(*apiv1.App) + if !ok { + return "" + } + + if original, exists := app.ObjectMeta.Annotations[labels.AcornOriginalImage]; exists { + return original + } + return app.Status.AppImage.Name +} diff --git a/pkg/tables/tables.go b/pkg/tables/tables.go index 0d4fb35e23..39a3f3a083 100644 --- a/pkg/tables/tables.go +++ b/pkg/tables/tables.go @@ -9,7 +9,7 @@ var ( App = [][]string{ {"Name", "{{ . | name }}"}, - {"Image", "{{ trunc .Status.AppImage.Name }}"}, + {"Image", "{{ . | imageName | trunc }}"}, {"Healthy", "Status.Columns.Healthy"}, {"Up-To-Date", "Status.Columns.UpToDate"}, {"Created", "{{ago .CreationTimestamp}}"},