Merge remote-tracking branch 'origin/main' into emosbaugh/sc-127648/spike-simplify-ec-release-process

Author: emosbaugh

.github/workflows/ci.yaml

@@ -860,6 +860,7 @@ jobs:
   e2e:
     name: E2E # this name is used by .github/workflows/automated-prs-manager.yaml
     runs-on: ${{ matrix.runner || 'ubuntu-22.04' }}
+    continue-on-error: ${{ matrix.continue-on-error || false }}
     needs:
       - build-install
       - build-upgrade
@@ -894,6 +895,8 @@ jobs:
             is-lxd: true
           - test: TestInstallWithMITMProxy
             is-lxd: true
+          - test: TestSingleNodeNetworkReport
+            continue-on-error: true
     steps:
       - name: Checkout
         uses: actions/checkout@v5

.gitignore

@@ -19,6 +19,7 @@ go.work.sum
 *.tmp
 .envrc
 .DS_Store
+.vscode
 
 # Ignore preflight bundles generated during local dev
 preflightbundle*

Makefile

@@ -164,10 +164,10 @@ output/bins/kubectl-kots-%:
 output/bins/kubectl-kots-override:
 	mkdir -p output/bins
 	mkdir -p output/tmp
-	if [[ "$(KOTS_BINARY_URL_OVERRIDE)" == ttl.sh* ]]; then \
-		oras pull "$(KOTS_BINARY_URL_OVERRIDE)" --output output/tmp ; \
-	else \
+	if [[ "$(KOTS_BINARY_URL_OVERRIDE)" == http://* ]] || [[ "$(KOTS_BINARY_URL_OVERRIDE)" == https://* ]]; then \
 		curl --retry 5 --retry-all-errors -fL -o output/tmp/kots.tar.gz "$(KOTS_BINARY_URL_OVERRIDE)" ; \
+	else \
+		oras pull "$(KOTS_BINARY_URL_OVERRIDE)" --output output/tmp ; \
 	fi
 	tar -xzf output/tmp/kots.tar.gz -C output/tmp
 	mv output/tmp/kots $@

api/controllers/app/install/apppreflight.go

@@ -17,6 +17,7 @@ import (
 type RunAppPreflightOptions struct {
 	PreflightBinaryPath string
 	ProxySpec           *ecv1beta1.ProxySpec
+	RegistrySettings    *types.RegistrySettings
 	ExtraPaths          []string
 	CleanupBinary       bool
 }
@@ -47,7 +48,7 @@ func (c *InstallController) RunAppPreflights(ctx context.Context, opts RunAppPre
 	}
 
 	// Extract app preflight spec from Helm charts
-	appPreflightSpec, err := c.appReleaseManager.ExtractAppPreflightSpec(ctx, configValues, opts.ProxySpec)
+	appPreflightSpec, err := c.appReleaseManager.ExtractAppPreflightSpec(ctx, configValues, opts.ProxySpec, opts.RegistrySettings)
 	if err != nil {
 		return fmt.Errorf("extract app preflight spec: %w", err)
 	}

api/controllers/app/install/controller.go

@@ -16,6 +16,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
+	"k8s.io/cli-runtime/pkg/genericclioptions"
 	kyaml "sigs.k8s.io/yaml"
 )
 
@@ -47,6 +48,8 @@ type InstallController struct {
 	clusterID                  string
 	airgapBundle               string
 	privateCACertConfigMapName string
+	restClientGetter           genericclioptions.RESTClientGetter
+	kubeConfigPath             string
 }
 
 type InstallControllerOption func(*InstallController)
@@ -129,6 +132,18 @@ func WithPrivateCACertConfigMapName(configMapName string) InstallControllerOptio
 	}
 }
 
+func WithRESTClientGetter(restClientGetter genericclioptions.RESTClientGetter) InstallControllerOption {
+	return func(c *InstallController) {
+		c.restClientGetter = restClientGetter
+	}
+}
+
+func WithKubeConfigPath(kubeConfigPath string) InstallControllerOption {
+	return func(c *InstallController) {
+		c.kubeConfigPath = kubeConfigPath
+	}
+}
+
 func NewInstallController(opts ...InstallControllerOption) (*InstallController, error) {
 	controller := &InstallController{
 		logger: logger.NewDiscardLogger(),
@@ -205,6 +220,8 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appinstallmanager.WithClusterID(controller.clusterID),
 			appinstallmanager.WithAirgapBundle(controller.airgapBundle),
 			appinstallmanager.WithAppInstallStore(controller.store.AppInstallStore()),
+			appinstallmanager.WithRESTClientGetter(controller.restClientGetter),
+			appinstallmanager.WithKubeConfigPath(controller.kubeConfigPath),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app install manager: %w", err)

api/controllers/app/install/test_suite.go

@@ -190,7 +190,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(expectedAPF, nil),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(expectedAPF, nil),
 					apm.On("RunAppPreflights", mock.Anything, mock.MatchedBy(func(opts apppreflightmanager.RunAppPreflightOptions) bool {
 						return expectedAPF == opts.AppPreflightSpec
 					})).Return(nil),
@@ -216,7 +216,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(expectedAPF, nil),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(expectedAPF, nil),
 					apm.On("RunAppPreflights", mock.Anything, mock.MatchedBy(func(opts apppreflightmanager.RunAppPreflightOptions) bool {
 						return expectedAPF == opts.AppPreflightSpec
 					})).Return(nil),
@@ -242,7 +242,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(expectedAPF, nil),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(expectedAPF, nil),
 					apm.On("RunAppPreflights", mock.Anything, mock.MatchedBy(func(opts apppreflightmanager.RunAppPreflightOptions) bool {
 						return expectedAPF == opts.AppPreflightSpec
 					})).Return(nil),
@@ -268,7 +268,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(expectedAPF, nil),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(expectedAPF, nil),
 					apm.On("RunAppPreflights", mock.Anything, mock.MatchedBy(func(opts apppreflightmanager.RunAppPreflightOptions) bool {
 						return expectedAPF == opts.AppPreflightSpec
 					})).Return(nil),
@@ -294,7 +294,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(expectedAPF, nil),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(expectedAPF, nil),
 					apm.On("RunAppPreflights", mock.Anything, mock.MatchedBy(func(opts apppreflightmanager.RunAppPreflightOptions) bool {
 						return expectedAPF == opts.AppPreflightSpec
 					})).Return(nil),
@@ -313,7 +313,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(expectedAPF, nil),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(expectedAPF, nil),
 					apm.On("RunAppPreflights", mock.Anything, mock.MatchedBy(func(opts apppreflightmanager.RunAppPreflightOptions) bool {
 						return expectedAPF == opts.AppPreflightSpec
 					})).Return(nil),
@@ -332,7 +332,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(expectedAPF, nil),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(expectedAPF, nil),
 					apm.On("RunAppPreflights", mock.Anything, mock.MatchedBy(func(opts apppreflightmanager.RunAppPreflightOptions) bool {
 						return expectedAPF == opts.AppPreflightSpec
 					})).Return(nil),
@@ -358,7 +358,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(nil, errors.New("extraction error")),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(nil, errors.New("extraction error")),
 				)
 			},
 			expectedErr: true,
@@ -373,7 +373,7 @@ func (s *AppInstallControllerTestSuite) TestRunAppPreflights() {
 			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),
-					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything).Return(expectedAPF, nil),
+					arm.On("ExtractAppPreflightSpec", mock.Anything, types.AppConfigValues{"test-item": types.AppConfigValue{Value: "test-value"}}, mock.Anything, mock.Anything).Return(expectedAPF, nil),
 					apm.On("RunAppPreflights", mock.Anything, mock.MatchedBy(func(opts apppreflightmanager.RunAppPreflightOptions) bool {
 						return expectedAPF == opts.AppPreflightSpec
 					})).Return(errors.New("run preflights error")),

api/controllers/kubernetes/install/controller.go

@@ -192,6 +192,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appcontroller.WithConfigValues(controller.configValues),
 			appcontroller.WithAirgapBundle(controller.airgapBundle),
 			appcontroller.WithPrivateCACertConfigMapName(""), // Private CA ConfigMap functionality not yet implemented for Kubernetes installations
+			appcontroller.WithRESTClientGetter(controller.restClientGetter),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app install controller: %w", err)

api/controllers/linux/install/controller.go

@@ -34,6 +34,7 @@ type Controller interface {
 	GetHostPreflightTitles(ctx context.Context) ([]string, error)
 	SetupInfra(ctx context.Context, ignoreHostPreflights bool) error
 	GetInfra(ctx context.Context) (types.Infra, error)
+	CalculateRegistrySettings(ctx context.Context) (*types.RegistrySettings, error)
 	// App controller methods
 	appcontroller.Controller
 }
@@ -239,6 +240,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			installation.WithInstallationStore(controller.store.LinuxInstallationStore()),
 			installation.WithLicense(controller.license),
 			installation.WithAirgapBundle(controller.airgapBundle),
+			installation.WithReleaseData(controller.releaseData),
 			installation.WithHostUtils(controller.hostUtils),
 			installation.WithNetUtils(controller.netUtils),
 		)
@@ -264,6 +266,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appcontroller.WithClusterID(controller.clusterID),
 			appcontroller.WithAirgapBundle(controller.airgapBundle),
 			appcontroller.WithPrivateCACertConfigMapName(adminconsole.PrivateCASConfigMapName), // Linux installations use the ConfigMap
+			appcontroller.WithKubeConfigPath(controller.rc.PathToKubeConfig()),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app install controller: %w", err)

api/controllers/linux/install/controller_mock.go

@@ -152,3 +152,12 @@ func (m *MockController) GetAppInstallStatus(ctx context.Context) (types.AppInst
 	args := m.Called(ctx)
 	return args.Get(0).(types.AppInstall), args.Error(1)
 }
+
+// CalculateRegistrySettings mocks the CalculateRegistrySettings method
+func (m *MockController) CalculateRegistrySettings(ctx context.Context) (*types.RegistrySettings, error) {
+	args := m.Called(ctx)
+	if args.Get(0) == nil {
+		return nil, args.Error(1)
+	}
+	return args.Get(0).(*types.RegistrySettings), args.Error(1)
+}

api/controllers/linux/install/installation.go

@@ -171,3 +171,7 @@ func (c *InstallController) computeCIDRs(config *types.LinuxInstallationConfig)
 func (c *InstallController) GetInstallationStatus(ctx context.Context) (types.Status, error) {
 	return c.installationManager.GetStatus()
 }
+
+func (c *InstallController) CalculateRegistrySettings(ctx context.Context) (*types.RegistrySettings, error) {
+	return c.installationManager.CalculateRegistrySettings(ctx, c.rc)
+}