@@ -2,15 +2,20 @@ package install
22
33import (
44 "context"
5+ "errors"
56 "fmt"
67 "runtime/debug"
78
89 states "github.com/replicatedhq/embedded-cluster/api/internal/states/install"
910 "github.com/replicatedhq/embedded-cluster/api/types"
1011)
1112
13+ var (
14+ ErrAppPreflightChecksFailed = errors .New ("app preflight checks failed" )
15+ )
16+
1217// InstallApp triggers app installation with proper state transitions and panic handling
13- func (c * InstallController ) InstallApp (ctx context.Context ) (finalErr error ) {
18+ func (c * InstallController ) InstallApp (ctx context.Context , ignoreAppPreflights bool ) (finalErr error ) {
1419 lock , err := c .stateMachine .AcquireLock ()
1520 if err != nil {
1621 return types .NewConflictError (err )
@@ -25,6 +30,18 @@ func (c *InstallController) InstallApp(ctx context.Context) (finalErr error) {
2530 }
2631 }()
2732
33+ // Check if app preflights have failed and if we should ignore them
34+ if c .stateMachine .CurrentState () == states .StateAppPreflightsFailed {
35+ allowIgnoreAppPreflights := true // TODO: implement once we check for strict app preflights
36+ if ! ignoreAppPreflights || ! allowIgnoreAppPreflights {
37+ return types .NewBadRequestError (ErrAppPreflightChecksFailed )
38+ }
39+ err = c .stateMachine .Transition (lock , states .StateAppPreflightsFailedBypassed )
40+ if err != nil {
41+ return fmt .Errorf ("failed to transition states: %w" , err )
42+ }
43+ }
44+
2845 if err := c .stateMachine .ValidateTransition (lock , states .StateAppInstalling ); err != nil {
2946 return types .NewConflictError (err )
3047 }
@@ -48,21 +65,18 @@ func (c *InstallController) InstallApp(ctx context.Context) (finalErr error) {
4865
4966 defer func () {
5067 if r := recover (); r != nil {
51- finalErr = fmt .Errorf ("panic installing app : %v: %s" , r , string (debug .Stack ()))
68+ finalErr = fmt .Errorf ("panic: %v: %s" , r , string (debug .Stack ()))
5269 }
53- // Handle errors from app installation
5470 if finalErr != nil {
5571 c .logger .Error (finalErr )
5672
5773 if err := c .stateMachine .Transition (lock , states .StateAppInstallFailed ); err != nil {
5874 c .logger .Errorf ("failed to transition states: %w" , err )
5975 }
60- return
61- }
62-
63- // Transition to succeeded state on successful app installation
64- if err := c .stateMachine .Transition (lock , states .StateSucceeded ); err != nil {
65- c .logger .Errorf ("failed to transition states: %w" , err )
76+ } else {
77+ if err := c .stateMachine .Transition (lock , states .StateSucceeded ); err != nil {
78+ c .logger .Errorf ("failed to transition states: %w" , err )
79+ }
6680 }
6781 }()
6882
@@ -78,23 +92,6 @@ func (c *InstallController) InstallApp(ctx context.Context) (finalErr error) {
7892 return nil
7993}
8094
81- // TODO: remove this once we have endpoints to trigger app installation and report status
82- // and the app installation is decoupled from the infra installation
83- func (c * InstallController ) InstallAppNoState (ctx context.Context ) error {
84- // Get config values for app installation
85- configValues , err := c .appConfigManager .GetKotsadmConfigValues ()
86- if err != nil {
87- return fmt .Errorf ("get kotsadm config values for app install: %w" , err )
88- }
89-
90- // Install the app using the app install manager
91- if err := c .appInstallManager .Install (ctx , configValues ); err != nil {
92- return fmt .Errorf ("install app: %w" , err )
93- }
94-
95- return nil
96- }
97-
9895func (c * InstallController ) GetAppInstallStatus (ctx context.Context ) (types.AppInstall , error ) {
9996 return c .appInstallManager .GetStatus ()
10097}
0 commit comments