Merge remote-tracking branch 'origin/main' into k0s-1-30

Author: emosbaugh

.github/workflows/cleanup-resources.yaml

@@ -0,0 +1,44 @@
+name: Cleanup Resources
+
+on:
+  schedule:
+    # Run every 12 hours
+    - cron: '0 */12 * * *'
+  workflow_dispatch: # Allow manual triggering
+
+jobs:
+  archive-instances:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run archive instances script
+        env:
+          REPLICATED_APP: "embedded-cluster-smoke-test-staging-app"
+          REPLICATED_API_TOKEN: ${{ secrets.STAGING_REPLICATED_API_TOKEN }}
+          REPLICATED_API_ORIGIN: "https://api.staging.replicated.com"
+          DRY_RUN: "false"
+        run: |
+          # Make script executable and run it
+          chmod +x ./scripts/archive-instances.sh
+          ./scripts/archive-instances.sh
+
+  demote-channel-releases:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Run demote channel releases script
+        env:
+          REPLICATED_APP: "embedded-cluster-smoke-test-staging-app"
+          REPLICATED_API_TOKEN: ${{ secrets.STAGING_REPLICATED_API_TOKEN }}
+          REPLICATED_API_ORIGIN: "https://api.staging.replicated.com"
+          DRY_RUN: "false"
+        run: |
+          # Make script executable and run it
+          chmod +x ./scripts/demote-channel-releases.sh
+          ./scripts/demote-channel-releases.sh

api/controllers/app/install/controller.go

@@ -25,7 +25,7 @@ type Controller interface {
 	GetAppPreflightStatus(ctx context.Context) (types.Status, error)
 	GetAppPreflightOutput(ctx context.Context) (*types.PreflightsOutput, error)
 	GetAppPreflightTitles(ctx context.Context) ([]string, error)
-	InstallApp(ctx context.Context) error
+	InstallApp(ctx context.Context, ignoreAppPreflights bool) error
 	GetAppInstallStatus(ctx context.Context) (types.AppInstall, error)
 }
 
@@ -159,6 +159,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 	if controller.appPreflightManager == nil {
 		controller.appPreflightManager = apppreflightmanager.NewAppPreflightManager(
 			apppreflightmanager.WithLogger(controller.logger),
+			apppreflightmanager.WithAppPreflightStore(controller.store.AppPreflightStore()),
 		)
 	}
 
@@ -181,6 +182,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appinstallmanager.WithReleaseData(controller.releaseData),
 			appinstallmanager.WithClusterID(controller.clusterID),
 			appinstallmanager.WithAirgapBundle(controller.airgapBundle),
+			appinstallmanager.WithAppInstallStore(controller.store.AppInstallStore()),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app install manager: %w", err)

api/controllers/app/install/controller_mock.go

@@ -69,8 +69,8 @@ func (m *MockController) GetAppPreflightTitles(ctx context.Context) ([]string, e
 }
 
 // InstallApp mocks the InstallApp method
-func (m *MockController) InstallApp(ctx context.Context) error {
-	args := m.Called(ctx)
+func (m *MockController) InstallApp(ctx context.Context, ignoreAppPreflights bool) error {
+	args := m.Called(ctx, ignoreAppPreflights)
 	return args.Error(0)
 }
 

api/controllers/app/install/install.go

@@ -2,15 +2,20 @@ package install
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"runtime/debug"
 
 	states "github.com/replicatedhq/embedded-cluster/api/internal/states/install"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 )
 
+var (
+	ErrAppPreflightChecksFailed = errors.New("app preflight checks failed")
+)
+
 // InstallApp triggers app installation with proper state transitions and panic handling
-func (c *InstallController) InstallApp(ctx context.Context) (finalErr error) {
+func (c *InstallController) InstallApp(ctx context.Context, ignoreAppPreflights bool) (finalErr error) {
 	lock, err := c.stateMachine.AcquireLock()
 	if err != nil {
 		return types.NewConflictError(err)
@@ -25,6 +30,18 @@ func (c *InstallController) InstallApp(ctx context.Context) (finalErr error) {
 		}
 	}()
 
+	// Check if app preflights have failed and if we should ignore them
+	if c.stateMachine.CurrentState() == states.StateAppPreflightsFailed {
+		allowIgnoreAppPreflights := true // TODO: implement once we check for strict app preflights
+		if !ignoreAppPreflights || !allowIgnoreAppPreflights {
+			return types.NewBadRequestError(ErrAppPreflightChecksFailed)
+		}
+		err = c.stateMachine.Transition(lock, states.StateAppPreflightsFailedBypassed)
+		if err != nil {
+			return fmt.Errorf("failed to transition states: %w", err)
+		}
+	}
+
 	if err := c.stateMachine.ValidateTransition(lock, states.StateAppInstalling); err != nil {
 		return types.NewConflictError(err)
 	}
@@ -48,21 +65,18 @@ func (c *InstallController) InstallApp(ctx context.Context) (finalErr error) {
 
 		defer func() {
 			if r := recover(); r != nil {
-				finalErr = fmt.Errorf("panic installing app: %v: %s", r, string(debug.Stack()))
+				finalErr = fmt.Errorf("panic: %v: %s", r, string(debug.Stack()))
 			}
-			// Handle errors from app installation
 			if finalErr != nil {
 				c.logger.Error(finalErr)
 
 				if err := c.stateMachine.Transition(lock, states.StateAppInstallFailed); err != nil {
 					c.logger.Errorf("failed to transition states: %w", err)
 				}
-				return
-			}
-
-			// Transition to succeeded state on successful app installation
-			if err := c.stateMachine.Transition(lock, states.StateSucceeded); err != nil {
-				c.logger.Errorf("failed to transition states: %w", err)
+			} else {
+				if err := c.stateMachine.Transition(lock, states.StateSucceeded); err != nil {
+					c.logger.Errorf("failed to transition states: %w", err)
+				}
 			}
 		}()
 
@@ -78,23 +92,6 @@ func (c *InstallController) InstallApp(ctx context.Context) (finalErr error) {
 	return nil
 }
 
-// TODO: remove this once we have endpoints to trigger app installation and report status
-// and the app installation is decoupled from the infra installation
-func (c *InstallController) InstallAppNoState(ctx context.Context) error {
-	// Get config values for app installation
-	configValues, err := c.appConfigManager.GetKotsadmConfigValues()
-	if err != nil {
-		return fmt.Errorf("get kotsadm config values for app install: %w", err)
-	}
-
-	// Install the app using the app install manager
-	if err := c.appInstallManager.Install(ctx, configValues); err != nil {
-		return fmt.Errorf("install app: %w", err)
-	}
-
-	return nil
-}
-
 func (c *InstallController) GetAppInstallStatus(ctx context.Context) (types.AppInstall, error) {
 	return c.appInstallManager.GetStatus()
 }

api/controllers/app/install/test_suite.go

@@ -185,7 +185,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			opts: RunAppPreflightOptions{
 				PreflightBinaryPath: "/usr/bin/preflight",
 			},
-			currentState:  states.StateSucceeded,
+			currentState:  states.StateInfrastructureInstalled,
 			expectedState: states.StateAppPreflightsSucceeded,
 			setupMocks: func(apm *apppreflightmanager.MockAppPreflightManager, arm *appreleasemanager.MockAppReleaseManager, acm *appconfig.MockAppConfigManager) {
 				mock.InOrder(
@@ -263,7 +263,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			opts: RunAppPreflightOptions{
 				PreflightBinaryPath: "/usr/bin/preflight",
 			},
-			currentState:  states.StateSucceeded,
+			currentState:  states.StateInfrastructureInstalled,
 			expectedState: states.StateAppPreflightsFailed,
 			setupMocks: func(apm *apppreflightmanager.MockAppPreflightManager, arm *appreleasemanager.MockAppReleaseManager, acm *appconfig.MockAppConfigManager) {
 				mock.InOrder(
@@ -289,7 +289,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			opts: RunAppPreflightOptions{
 				PreflightBinaryPath: "/usr/bin/preflight",
 			},
-			currentState:  states.StateSucceeded,
+			currentState:  states.StateInfrastructureInstalled,
 			expectedState: states.StateAppPreflightsExecutionFailed,
 			setupMocks: func(apm *apppreflightmanager.MockAppPreflightManager, arm *appreleasemanager.MockAppReleaseManager, acm *appconfig.MockAppConfigManager) {
 				mock.InOrder(
@@ -308,7 +308,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			opts: RunAppPreflightOptions{
 				PreflightBinaryPath: "/usr/bin/preflight",
 			},
-			currentState:  states.StateSucceeded,
+			currentState:  states.StateInfrastructureInstalled,
 			expectedState: states.StateAppPreflightsSucceeded,
 			setupMocks: func(apm *apppreflightmanager.MockAppPreflightManager, arm *appreleasemanager.MockAppReleaseManager, acm *appconfig.MockAppConfigManager) {
 				mock.InOrder(
@@ -327,7 +327,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			opts: RunAppPreflightOptions{
 				PreflightBinaryPath: "/usr/bin/preflight",
 			},
-			currentState:  states.StateSucceeded,
+			currentState:  states.StateInfrastructureInstalled,
 			expectedState: states.StateAppPreflightsSucceeded,
 			setupMocks: func(apm *apppreflightmanager.MockAppPreflightManager, arm *appreleasemanager.MockAppReleaseManager, acm *appconfig.MockAppConfigManager) {
 				mock.InOrder(
@@ -353,8 +353,8 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			opts: RunAppPreflightOptions{
 				PreflightBinaryPath: "/usr/bin/preflight",
 			},
-			currentState:  states.StateSucceeded,
-			expectedState: states.StateSucceeded,
+			currentState:  states.StateInfrastructureInstalled,
+			expectedState: states.StateInfrastructureInstalled,
 			setupMocks: func(apm *apppreflightmanager.MockAppPreflightManager, arm *appreleasemanager.MockAppReleaseManager, acm *appconfig.MockAppConfigManager) {
 				mock.InOrder(
 					acm.On("GetConfigValues").Return(types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, nil),
@@ -368,7 +368,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			opts: RunAppPreflightOptions{
 				PreflightBinaryPath: "/usr/bin/preflight",
 			},
-			currentState:  states.StateSucceeded,
+			currentState:  states.StateInfrastructureInstalled,
 			expectedState: states.StateAppPreflightsExecutionFailed,
 			setupMocks: func(apm *apppreflightmanager.MockAppPreflightManager, arm *appreleasemanager.MockAppReleaseManager, acm *appconfig.MockAppConfigManager) {
 				mock.InOrder(
@@ -501,11 +501,12 @@ func (s *AppInstallControllerTestSuite) TestGetAppInstallStatus() {
 
 func (s *AppInstallControllerTestSuite) TestInstallApp() {
 	tests := []struct {
-		name          string
-		currentState  statemachine.State
-		expectedState statemachine.State
-		setupMocks    func(*appconfig.MockAppConfigManager, *appinstallmanager.MockAppInstallManager)
-		expectedErr   bool
+		name                string
+		ignoreAppPreflights bool
+		currentState        statemachine.State
+		expectedState       statemachine.State
+		setupMocks          func(*appconfig.MockAppConfigManager, *appinstallmanager.MockAppInstallManager)
+		expectedErr         bool
 	}{
 		{
 			name:          "invalid state transition from succeeded state",
@@ -574,6 +575,37 @@ func (s *AppInstallControllerTestSuite) TestInstallApp() {
 			},
 			expectedErr: true,
 		},
+		{
+			name:                "successful app installation with failed preflights - ignored",
+			ignoreAppPreflights: true,
+			currentState:        states.StateAppPreflightsFailed,
+			expectedState:       states.StateSucceeded,
+			setupMocks: func(acm *appconfig.MockAppConfigManager, aim *appinstallmanager.MockAppInstallManager) {
+				mock.InOrder(
+					acm.On("GetKotsadmConfigValues").Return(kotsv1beta1.ConfigValues{
+						Spec: kotsv1beta1.ConfigValuesSpec{
+							Values: map[string]kotsv1beta1.ConfigValue{
+								"test-key": {Value: "test-value"},
+							},
+						},
+					}, nil),
+					aim.On("Install", mock.Anything, mock.MatchedBy(func(cv kotsv1beta1.ConfigValues) bool {
+						return cv.Spec.Values["test-key"].Value == "test-value"
+					})).Return(nil),
+				)
+			},
+			expectedErr: false,
+		},
+		{
+			name:                "failed app installation with failed preflights - not ignored",
+			ignoreAppPreflights: false,
+			currentState:        states.StateAppPreflightsFailed,
+			expectedState:       states.StateAppPreflightsFailed,
+			setupMocks: func(acm *appconfig.MockAppConfigManager, aim *appinstallmanager.MockAppInstallManager) {
+				// No mocks needed as method should return early with error
+			},
+			expectedErr: true,
+		},
 	}
 
 	for _, tt := range tests {
@@ -596,7 +628,7 @@ func (s *AppInstallControllerTestSuite) TestInstallApp() {
 			require.NoError(t, err, "failed to create install controller")
 
 			tt.setupMocks(appConfigManager, appInstallManager)
-			err = controller.InstallApp(t.Context())
+			err = controller.InstallApp(t.Context(), tt.ignoreAppPreflights)
 
 			if tt.expectedErr {
 				assert.Error(t, err)

api/controllers/kubernetes/install/controller.go

@@ -201,7 +201,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 	if controller.infraManager == nil {
 		infraManager, err := infra.NewInfraManager(
 			infra.WithLogger(controller.logger),
-			infra.WithInfraStore(controller.store.LinuxInfraStore()),
+			infra.WithInfraStore(controller.store.KubernetesInfraStore()),
 			infra.WithRESTClientGetter(controller.restClientGetter),
 			infra.WithPassword(controller.password),
 			infra.WithTLSConfig(controller.tlsConfig),
@@ -216,6 +216,8 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 		controller.infraManager = infraManager
 	}
 
+	controller.registerReportingHandlers()
+
 	return controller, nil
 }
 

api/controllers/kubernetes/install/controller_mock.go

@@ -109,8 +109,8 @@ func (m *MockController) RunAppPreflights(ctx context.Context, opts appcontrolle
 }
 
 // InstallApp mocks the InstallApp method
-func (m *MockController) InstallApp(ctx context.Context) error {
-	args := m.Called(ctx)
+func (m *MockController) InstallApp(ctx context.Context, ignoreAppPreflights bool) error {
+	args := m.Called(ctx, ignoreAppPreflights)
 	return args.Error(0)
 }