some tweaks for stability of async render

pkg/lifecycle/daemon/routes_navcycle_completestep.go

@@ -14,6 +14,7 @@ import (
 	"github.com/replicatedhq/ship/pkg/api"
 	"github.com/replicatedhq/ship/pkg/lifecycle/daemon/daemontypes"
 	"github.com/replicatedhq/ship/pkg/lifecycle/daemon/statusonly"
+	"github.com/replicatedhq/ship/pkg/state"
 )
 
 func (d *NavcycleRoutes) completeStep(c *gin.Context) {
@@ -37,44 +38,50 @@ func (d *NavcycleRoutes) completeStep(c *gin.Context) {
 			return
 		}
 
-		err := d.StepExecutor(d, step)
-		err = d.handleSyncStep(err, debug, step, stepID)
+		currentState, err := d.StateManager.TryLoad()
 		if err != nil {
-			level.Error(d.Logger).Log("event", "sync.fail", "error", err)
 			c.AbortWithError(500, err)
+			return
 		}
+
+		errChan := make(chan error)
+		d.StepProgress.Store(stepID, daemontypes.JSONProgress("v2router", map[string]interface{}{
+			"status": "working",
+		}))
+		go func() {
+			errChan <- d.StepExecutor(d, step)
+		}()
+
+		// hack, give it 10 ms in case its an instant step. Hydrate and send will read progress from the syncMap
+		time.Sleep(10 * time.Millisecond)
+
 		d.hydrateAndSend(daemontypes.NewStep(step), c)
+		go d.handleAsync(errChan, debug, step, stepID, currentState)
 		return
 	}
 
 	d.errNotFond(c)
 }
 
-func (d *NavcycleRoutes) handleSyncStep(err error, debug log.Logger, step api.Step, stepID string) error {
+func (d *NavcycleRoutes) handleAsync(errChan chan error, debug log.Logger, step api.Step, stepID string, state state.State) {
+	err := d.awaitAsyncStep(errChan, debug, step)
 	if err != nil {
 		debug.Log("event", "execute.fail", "err", err)
 		d.StepProgress.Store(stepID, daemontypes.JSONProgress("v2router", map[string]interface{}{
 			"status": fmt.Sprintf("failed - %v", err),
 		}))
-		return errors.Wrap(err, "execute step")
-	}
-	currentState, err := d.StateManager.TryLoad()
-	if err != nil {
-		return errors.Wrap(err, "load state")
+		return
 	}
-
-	newState := currentState.Versioned().WithCompletedStep(step)
+	newState := state.Versioned().WithCompletedStep(step)
 	err = d.StateManager.Save(newState)
 	if err != nil {
-		level.Error(debug).Log("event", "state.save.fail", "err", err)
-		return errors.Wrap(err, "save state")
+		level.Error(d.Logger).Log("event", "state.save.fail", "err", err, "step.id", stepID)
+		return
 	}
+
 	d.StepProgress.Store(stepID, daemontypes.JSONProgress("v2router", map[string]interface{}{
 		"status": "success",
 	}))
-	// HAAAACK
-	time.Sleep(1 * time.Second)
-	return nil
 }
 
 func (d *NavcycleRoutes) awaitAsyncStep(errChan chan error, debug log.Logger, step api.Step) error {

pkg/specs/chart.go

@@ -91,8 +91,7 @@ var (
 					{
 						KustomizeIntro: &api.KustomizeIntro{
 							StepShared: api.StepShared{
-								ID:       "kustomize-intro",
-								Requires: []string{"render"},
+								ID: "kustomize-intro",
 							},
 						},
 					},