updates

pkg/airgap/airgap.go

@@ -257,7 +257,7 @@ func CreateAppFromAirgap(opts CreateAirgapAppOpts) (finalError error) {
 		return errors.Wrap(err, "failed to set app is airgap the second time")
 	}
 
-	newSequence, err := store.GetStore().CreateAppVersion(a.ID, nil, tmpRoot, "Airgap Install", opts.IsAutomated, configFile, opts.SkipPreflights, render.Renderer{})
+	newSequence, err := store.GetStore().CreateAppVersion(a.ID, nil, tmpRoot, "Airgap Install", true, opts.IsAutomated, configFile, opts.SkipPreflights, render.Renderer{})
 	if err != nil {
 		return errors.Wrap(err, "failed to create new version")
 	}

pkg/airgap/update.go

@@ -229,7 +229,7 @@ func UpdateAppFromPath(a *apptypes.App, airgapRoot string, airgapBundlePath stri
 	}
 
 	// Create the app in the db
-	newSequence, err := store.GetStore().CreateAppVersion(a.ID, &baseSequence, archiveDir, "Airgap Update", false, "", skipPreflights, render.Renderer{})
+	newSequence, err := store.GetStore().CreateAppVersion(a.ID, &baseSequence, archiveDir, "Airgap Update", false, false, "", skipPreflights, render.Renderer{})
 	if err != nil {
 		return errors.Wrap(err, "failed to create new version")
 	}

pkg/handlers/config.go

@@ -749,7 +749,7 @@ func updateAppConfig(updateApp *apptypes.App, sequence int64, configGroups []kot
 	}
 
 	if createNewVersion {
-		newSequence, err := store.GetStore().CreateAppVersion(updateApp.ID, &sequence, archiveDir, "Config Change", false, "", skipPreflights, render.Renderer{})
+		newSequence, err := store.GetStore().CreateAppVersion(updateApp.ID, &sequence, archiveDir, "Config Change", false, false, "", skipPreflights, render.Renderer{})
 		if err != nil {
 			updateAppConfigResponse.Error = "failed to create an app version"
 			return updateAppConfigResponse, err
@@ -761,7 +761,7 @@ func updateAppConfig(updateApp *apptypes.App, sequence int64, configGroups []kot
 			updateAppConfigResponse.Error = "failed to get existing downstream version source"
 			return updateAppConfigResponse, err
 		}
-		if err := store.GetStore().UpdateAppVersion(updateApp.ID, sequence, nil, archiveDir, source, false, "", skipPreflights, render.Renderer{}); err != nil {
+		if err := store.GetStore().UpdateAppVersion(updateApp.ID, sequence, nil, archiveDir, source, skipPreflights, render.Renderer{}); err != nil {
 			updateAppConfigResponse.Error = "failed to update app version"
 			return updateAppConfigResponse, err
 		}

pkg/handlers/identity.go

@@ -470,7 +470,7 @@ func (h *Handler) ConfigureAppIdentityService(w http.ResponseWriter, r *http.Req
 		return
 	}
 
-	newSequence, err := store.GetStore().CreateAppVersion(a.ID, &latestSequence, archiveDir, "Identity Service", false, "", false, render.Renderer{})
+	newSequence, err := store.GetStore().CreateAppVersion(a.ID, &latestSequence, archiveDir, "Identity Service", false, false, "", false, render.Renderer{})
 	if err != nil {
 		err = errors.Wrap(err, "failed to create an app version")
 		logger.Error(err)

pkg/handlers/registry.go

@@ -257,7 +257,7 @@ func (h *Handler) UpdateAppRegistry(w http.ResponseWriter, r *http.Request) {
 		}
 		defer os.RemoveAll(appDir)
 
-		newSequence, err := store.GetStore().CreateAppVersion(foundApp.ID, &latestSequence, appDir, "Registry Change", false, "", false, render.Renderer{})
+		newSequence, err := store.GetStore().CreateAppVersion(foundApp.ID, &latestSequence, appDir, "Registry Change", false, false, "", false, render.Renderer{})
 		if err != nil {
 			logger.Error(errors.Wrap(err, "failed to create app version"))
 			return

pkg/handlers/upload.go

@@ -190,7 +190,7 @@ func (h *Handler) UploadExistingApp(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	newSequence, err := store.GetStore().CreateAppVersion(a.ID, &baseSequence, archiveDir, "KOTS Upload", false, "", uploadExistingAppRequest.SkipPreflights, render.Renderer{})
+	newSequence, err := store.GetStore().CreateAppVersion(a.ID, &baseSequence, archiveDir, "KOTS Upload", false, false, "", uploadExistingAppRequest.SkipPreflights, render.Renderer{})
 	if err != nil {
 		uploadResponse.Error = util.StrPointer("failed to create app version")
 		logger.Error(errors.Wrap(err, *uploadResponse.Error))

pkg/kotsadmupstream/upstream.go

@@ -266,14 +266,14 @@ func DownloadUpdate(appID string, update types.Update, skipPreflights bool, skip
 		if afterKotsKinds.Installation.Spec.UpdateCursor == beforeInstallation.UpdateCursor && afterKotsKinds.Installation.Spec.ChannelID == beforeInstallation.ChannelID {
 			return
 		}
-		newSequence, err := store.GetStore().CreateAppVersion(a.ID, &baseSequence, archiveDir, "Upstream Update", false, "", skipPreflights, render.Renderer{})
+		newSequence, err := store.GetStore().CreateAppVersion(a.ID, &baseSequence, archiveDir, "Upstream Update", false, false, "", skipPreflights, render.Renderer{})
 		if err != nil {
 			finalError = errors.Wrap(err, "failed to create version")
 			return
 		}
 		finalSequence = &newSequence
 	} else {
-		err := store.GetStore().UpdateAppVersion(a.ID, *update.AppSequence, &baseSequence, archiveDir, "Upstream Update", false, "", skipPreflights, render.Renderer{})
+		err := store.GetStore().UpdateAppVersion(a.ID, *update.AppSequence, &baseSequence, archiveDir, "Upstream Update", skipPreflights, render.Renderer{})
 		if err != nil {
 			finalError = errors.Wrap(err, "failed to create version")
 			return

pkg/online/online.go

@@ -191,7 +191,7 @@ func CreateAppFromOnline(opts CreateOnlineAppOpts) (_ *kotsutil.KotsKinds, final
 		return nil, errors.Wrap(err, "failed to set app is not airgap")
 	}
 
-	newSequence, err := store.GetStore().CreateAppVersion(opts.PendingApp.ID, nil, tmpRoot, "Online Install", opts.IsAutomated, configFile, opts.SkipPreflights, render.Renderer{})
+	newSequence, err := store.GetStore().CreateAppVersion(opts.PendingApp.ID, nil, tmpRoot, "Online Install", true, opts.IsAutomated, configFile, opts.SkipPreflights, render.Renderer{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create new version")
 	}

pkg/operator/operator.go

@@ -1001,7 +1001,7 @@ func (o *Operator) reconcileDeployment(cm *corev1.ConfigMap) (finalError error)
 		return errors.Wrap(err, "failed to extract app archive")
 	}
 
-	sequence, err := o.store.CreateAppVersion(appID, &baseSequence, archiveDir, source, false, "", skipPreflights, render.Renderer{})
+	sequence, err := o.store.CreateAppVersion(appID, &baseSequence, archiveDir, source, false, false, "", skipPreflights, render.Renderer{})
 	if err != nil {
 		return errors.Wrap(err, "failed to create app version")
 	}

pkg/store/kotsstore/license_store.go

@@ -216,7 +216,7 @@ func (s *KOTSStore) createNewVersionForLicenseChangeStatements(appID string, bas
 		return nil, int64(0), errors.Wrap(err, "failed to render new version")
 	}
 
-	appVersionStatements, newSequence, err := s.createAppVersionStatements(appID, &baseSequence, archiveDir, "License Change", false, "", false, renderer)
+	appVersionStatements, newSequence, err := s.createAppVersionStatements(appID, &baseSequence, archiveDir, "License Change", false, false, "", false, renderer)
 	if err != nil {
 		return nil, int64(0), errors.Wrap(err, "failed to construct app version statements")
 	}

pkg/store/kotsstore/version_store.go

@@ -407,7 +407,7 @@ func (s *KOTSStore) CreatePendingDownloadAppVersion(appID string, update upstrea
 	return newSequence, nil
 }
 
-func (s *KOTSStore) UpdateAppVersion(appID string, sequence int64, baseSequence *int64, filesInDir string, source string, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) error {
+func (s *KOTSStore) UpdateAppVersion(appID string, sequence int64, baseSequence *int64, filesInDir string, source string, skipPreflights bool, renderer rendertypes.Renderer) error {
 	// make sure version exists first
 	if v, err := s.GetAppVersion(appID, sequence); err != nil {
 		return errors.Wrap(err, "failed to get app version")
@@ -417,7 +417,7 @@ func (s *KOTSStore) UpdateAppVersion(appID string, sequence int64, baseSequence
 
 	db := persistence.MustGetDBSession()
 
-	appVersionStatements, err := s.upsertAppVersionStatements(appID, sequence, baseSequence, filesInDir, source, isAutomated, configFile, skipPreflights, renderer)
+	appVersionStatements, err := s.upsertAppVersionStatements(appID, sequence, baseSequence, filesInDir, source, false, false, "", skipPreflights, renderer)
 	if err != nil {
 		return errors.Wrap(err, "failed to construct app version statements")
 	}
@@ -433,9 +433,9 @@ func (s *KOTSStore) UpdateAppVersion(appID string, sequence int64, baseSequence
 	return nil
 }
 
-func (s *KOTSStore) CreateAppVersion(appID string, baseSequence *int64, filesInDir string, source string, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) (int64, error) {
+func (s *KOTSStore) CreateAppVersion(appID string, baseSequence *int64, filesInDir string, source string, isInstall bool, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) (int64, error) {
 	db := persistence.MustGetDBSession()
-	appVersionStatements, newSequence, err := s.createAppVersionStatements(appID, baseSequence, filesInDir, source, isAutomated, configFile, skipPreflights, renderer)
+	appVersionStatements, newSequence, err := s.createAppVersionStatements(appID, baseSequence, filesInDir, source, isInstall, isAutomated, configFile, skipPreflights, renderer)
 	if err != nil {
 		return 0, errors.Wrap(err, "failed to construct app version statements")
 	}
@@ -451,21 +451,21 @@ func (s *KOTSStore) CreateAppVersion(appID string, baseSequence *int64, filesInD
 	return newSequence, nil
 }
 
-func (s *KOTSStore) createAppVersionStatements(appID string, baseSequence *int64, filesInDir string, source string, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) ([]gorqlite.ParameterizedStatement, int64, error) {
+func (s *KOTSStore) createAppVersionStatements(appID string, baseSequence *int64, filesInDir string, source string, isInstall bool, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) ([]gorqlite.ParameterizedStatement, int64, error) {
 	newSequence, err := s.GetNextAppSequence(appID)
 	if err != nil {
 		return nil, 0, errors.Wrap(err, "failed to get next sequence number")
 	}
 
-	appVersionStatements, err := s.upsertAppVersionStatements(appID, newSequence, baseSequence, filesInDir, source, isAutomated, configFile, skipPreflights, renderer)
+	appVersionStatements, err := s.upsertAppVersionStatements(appID, newSequence, baseSequence, filesInDir, source, isInstall, isAutomated, configFile, skipPreflights, renderer)
 	if err != nil {
 		return nil, 0, errors.Wrap(err, "failed to construct app version statements")
 	}
 
 	return appVersionStatements, newSequence, nil
 }
 
-func (s *KOTSStore) upsertAppVersionStatements(appID string, sequence int64, baseSequence *int64, filesInDir string, source string, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) ([]gorqlite.ParameterizedStatement, error) {
+func (s *KOTSStore) upsertAppVersionStatements(appID string, sequence int64, baseSequence *int64, filesInDir string, source string, isInstall bool, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) ([]gorqlite.ParameterizedStatement, error) {
 	statements := []gorqlite.ParameterizedStatement{}
 
 	kotsKinds, err := kotsutil.LoadKotsKinds(filesInDir)
@@ -546,7 +546,7 @@ func (s *KOTSStore) upsertAppVersionStatements(appID string, sequence int64, bas
 	for _, d := range downstreams {
 		// there's a small chance this is not optimal, but no current code path
 		// will support multiple downstreams, so this is cleaner here for now
-		downstreamStatus, err := s.DetermineDownstreamVersionStatus(a, sequence, kotsKinds, baseSequence == nil, isAutomated, configFile, skipPreflights)
+		downstreamStatus, err := s.determineDownstreamVersionStatus(a, sequence, kotsKinds, isInstall, isAutomated, configFile, skipPreflights)
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to determine downstream version status")
 		}
@@ -727,9 +727,9 @@ func (s *KOTSStore) upsertAppVersionRecordStatements(appID string, sequence int6
 	return statements, nil
 }
 
-func (s *KOTSStore) DetermineDownstreamVersionStatus(a *apptypes.App, sequence int64, kotsKinds *kotsutil.KotsKinds, isInitialVersion bool, isAutomated bool, configFile string, skipPreflights bool) (types.DownstreamVersionStatus, error) {
+func (s *KOTSStore) determineDownstreamVersionStatus(a *apptypes.App, sequence int64, kotsKinds *kotsutil.KotsKinds, isInstall bool, isAutomated bool, configFile string, skipPreflights bool) (types.DownstreamVersionStatus, error) {
 	// Check if we need to show cluster management
-	if util.IsEmbeddedCluster() && isInitialVersion && configFile == "" {
+	if util.IsEmbeddedCluster() && isInstall && configFile == "" {
 		return types.VersionPendingClusterManagement, nil
 	}
 
@@ -746,7 +746,7 @@ func (s *KOTSStore) DetermineDownstreamVersionStatus(a *apptypes.App, sequence i
 		if needsConfig {
 			return types.VersionPendingConfig, nil
 		}
-		if isInitialVersion && !isAutomated {
+		if isInstall && !isAutomated {
 			// initial installs from the UI should show the config page even if all required items are already set and have values
 			return types.VersionPendingConfig, nil
 		}

pkg/store/store_interface.go

@@ -183,8 +183,8 @@ type VersionStore interface {
 	GetAppVersionBaseSequence(appID string, versionLabel string) (int64, error)
 	GetAppVersionBaseArchive(appID string, versionLabel string) (string, int64, error)
 	CreatePendingDownloadAppVersion(appID string, update upstreamtypes.Update, kotsApplication *kotsv1beta1.Application, license *kotsv1beta1.License) (int64, error)
-	UpdateAppVersion(appID string, sequence int64, baseSequence *int64, filesInDir string, source string, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) error
-	CreateAppVersion(appID string, baseSequence *int64, filesInDir string, source string, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) (int64, error)
+	UpdateAppVersion(appID string, sequence int64, baseSequence *int64, filesInDir string, source string, skipPreflights bool, renderer rendertypes.Renderer) error
+	CreateAppVersion(appID string, baseSequence *int64, filesInDir string, source string, isInstall bool, isAutomated bool, configFile string, skipPreflights bool, renderer rendertypes.Renderer) (int64, error)
 	GetAppVersion(appID string, sequence int64) (*versiontypes.AppVersion, error)
 	GetLatestAppSequence(appID string, downloadedOnly bool) (int64, error)
 	UpdateNextAppVersionDiffSummary(appID string, baseSequence int64) error