Merge pull request #1895 from ibuildthecloud/main

Add "completed" to the appStatus

Author: ibuildthecloud

pkg/apis/internal.acorn.io/v1/appstatus.go

@@ -13,6 +13,7 @@ type AppStatus struct {
 
 	Endpoints []Endpoint `json:"endpoints,omitempty"`
 	Stopped   bool       `json:"stopped,omitempty"`
+	Completed bool       `json:"completed,omitempty"`
 }
 
 type DependencyNotFound struct {

pkg/cli/apps.go

@@ -55,7 +55,7 @@ func (a *App) Run(cmd *cobra.Command, args []string) error {
 	}
 
 	for _, app := range apps {
-		if (app.Status.AppStatus.Stopped || inactive(app)) && !a.All {
+		if (app.Status.AppStatus.Stopped || app.Status.AppStatus.Completed) && !a.All {
 			continue
 		}
 		if len(args) > 0 {
@@ -70,14 +70,6 @@ func (a *App) Run(cmd *cobra.Command, args []string) error {
 	return out.Err()
 }
 
-func inactive(app apiv1.App) bool {
-	return strings.Contains(app.Name, ".") &&
-		app.Status.Ready &&
-		app.Status.Columns.Healthy == "0" &&
-		app.Status.Columns.UpToDate == "0" &&
-		app.Status.Columns.Message == "OK"
-}
-
 func writeApp(ctx context.Context, app *apiv1.App, out table.Writer, c client.Client) {
 	image, err := c.ImageGet(ctx, strings.TrimPrefix(app.Status.AppImage.Digest, "sha256:"))
 	if err != nil {

pkg/controller/appstatus/cli_status.go

@@ -17,6 +17,17 @@ func CLIStatus(req router.Request, resp router.Response) (err error) {
 	app.Status.Columns.Healthy = healthy(app)
 	app.Status.Columns.Message = message(app)
 	app.Status.Columns.Endpoints, err = endpoints(req, app)
+
+	// There's clearly a better way to do this, but it works and I'm lazy. The intention is that we want
+	// to detect that the acorn doesn't have any running containers (or needs to run containers) and has
+	// produced whatever it needs to and the status is not really helpful anymore, because it's done.
+	app.Status.AppStatus.Completed = strings.Contains(app.Name, ".") &&
+		app.Status.Ready &&
+		app.Status.Columns.Healthy == "0" &&
+		app.Status.Columns.UpToDate == "0" &&
+		app.Status.Columns.Message == "OK" &&
+		app.Status.Columns.Endpoints == ""
+
 	resp.Objects(app)
 	return
 }