f

Author: emosbaugh

api/api.go

@@ -122,7 +122,7 @@ func WithHelmClient(hcli helm.Client) Option {
 
 // New creates a new API instance.
 func New(cfg types.APIConfig, opts ...Option) (*API, error) {
-	if cfg.Target == "" {
+	if cfg.InstallTarget == "" {
 		return nil, fmt.Errorf("target is required")
 	}
 

api/clients.go

@@ -20,13 +20,13 @@ func (a *API) initClients() error {
 
 // initHelmClient initializes the Helm client based on the installation target
 func (a *API) initHelmClient() error {
-	switch a.cfg.Target {
-	case types.TargetLinux:
+	switch a.cfg.InstallTarget {
+	case types.InstallTargetLinux:
 		return a.initLinuxHelmClient()
-	case types.TargetKubernetes:
+	case types.InstallTargetKubernetes:
 		return a.initKubernetesHelmClient()
 	default:
-		return fmt.Errorf("unsupported install target: %s", a.cfg.Target)
+		return fmt.Errorf("unsupported install target: %s", a.cfg.InstallTarget)
 	}
 }
 

api/controllers/app/controller.go

@@ -14,6 +14,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/internal/store"
 	"github.com/replicatedhq/embedded-cluster/api/pkg/logger"
 	"github.com/replicatedhq/embedded-cluster/api/types"
+	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
@@ -46,6 +47,7 @@ type AppController struct {
 	logger                     logrus.FieldLogger
 	license                    []byte
 	releaseData                *release.ReleaseData
+	hcli                       helm.Client
 	store                      store.Store
 	configValues               types.AppConfigValues
 	clusterID                  string
@@ -109,6 +111,12 @@ func WithReleaseData(releaseData *release.ReleaseData) AppControllerOption {
 	}
 }
 
+func WithHelmClient(hcli helm.Client) AppControllerOption {
+	return func(c *AppController) {
+		c.hcli = hcli
+	}
+}
+
 func WithConfigValues(configValues types.AppConfigValues) AppControllerOption {
 	return func(c *AppController) {
 		c.configValues = configValues
@@ -202,6 +210,7 @@ func NewAppController(opts ...AppControllerOption) (*AppController, error) {
 			appreleasemanager.WithLicense(license),
 			appreleasemanager.WithIsAirgap(controller.airgapBundle != ""),
 			appreleasemanager.WithPrivateCACertConfigMapName(controller.privateCACertConfigMapName),
+			appreleasemanager.WithHelmClient(controller.hcli),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app release manager: %w", err)

api/controllers/kubernetes/upgrade/controller.go

@@ -133,6 +133,7 @@ func NewUpgradeController(opts ...UpgradeControllerOption) (*UpgradeController,
 			appcontroller.WithConfigValues(controller.configValues),
 			appcontroller.WithAirgapBundle(controller.airgapBundle),
 			appcontroller.WithPrivateCACertConfigMapName(""), // Private CA ConfigMap functionality not yet implemented for Kubernetes installations
+			appcontroller.WithHelmClient(controller.hcli),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app controller: %w", err)

api/controllers/linux/install/controller.go

@@ -274,6 +274,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appcontroller.WithClusterID(controller.clusterID),
 			appcontroller.WithAirgapBundle(controller.airgapBundle),
 			appcontroller.WithPrivateCACertConfigMapName(adminconsole.PrivateCASConfigMapName), // Linux installations use the ConfigMap
+			appcontroller.WithHelmClient(controller.hcli),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app controller: %w", err)

api/controllers/linux/upgrade/controller.go

@@ -268,6 +268,7 @@ func NewUpgradeController(opts ...UpgradeControllerOption) (*UpgradeController,
 			appcontroller.WithClusterID(controller.clusterID),
 			appcontroller.WithAirgapBundle(controller.airgapBundle),
 			appcontroller.WithPrivateCACertConfigMapName(adminconsole.PrivateCASConfigMapName), // Linux upgrades use the ConfigMap
+			appcontroller.WithHelmClient(controller.hcli),
 		)
 		if err != nil {
 			return nil, fmt.Errorf("create app controller: %w", err)

api/handlers.go

@@ -50,14 +50,15 @@ func (a *API) initHandlers() error {
 	}
 	a.handlers.health = healthHandler
 
-	if a.cfg.Target == types.TargetLinux {
+	if a.cfg.InstallTarget == types.InstallTargetLinux {
 		// Linux handler
 		linuxHandler, err := linuxhandler.New(
 			a.cfg,
 			linuxhandler.WithLogger(a.logger),
 			linuxhandler.WithMetricsReporter(a.metricsReporter),
 			linuxhandler.WithInstallController(a.linuxInstallController),
 			linuxhandler.WithUpgradeController(a.linuxUpgradeController),
+			linuxhandler.WithHelmClient(a.hcli),
 		)
 		if err != nil {
 			return fmt.Errorf("new linux handler: %w", err)
@@ -70,6 +71,7 @@ func (a *API) initHandlers() error {
 			kuberneteshandler.WithLogger(a.logger),
 			kuberneteshandler.WithInstallController(a.kubernetesInstallController),
 			kuberneteshandler.WithUpgradeController(a.kubernetesUpgradeController),
+			kuberneteshandler.WithHelmClient(a.hcli),
 		)
 		if err != nil {
 			return fmt.Errorf("new kubernetes handler: %w", err)

api/integration/app/install/config_test.go

@@ -1051,7 +1051,7 @@ func TestAppInstallSuite(t *testing.T) {
 				)
 				require.NoError(t, err)
 				// Create the API with the install controller
-				return integration.NewAPIWithReleaseData(t, types.ModeInstall, types.TargetLinux,
+				return integration.NewAPIWithReleaseData(t, types.ModeInstall, types.InstallTargetLinux,
 					api.WithLinuxInstallController(controller),
 					api.WithAuthController(auth.NewStaticAuthController("TOKEN")),
 					api.WithLogger(logger.NewDiscardLogger()),
@@ -1071,7 +1071,7 @@ func TestAppInstallSuite(t *testing.T) {
 				)
 				require.NoError(t, err)
 				// Create the API with the install controller
-				return integration.NewAPIWithReleaseData(t, types.ModeInstall, types.TargetKubernetes,
+				return integration.NewAPIWithReleaseData(t, types.ModeInstall, types.InstallTargetKubernetes,
 					api.WithKubernetesInstallController(controller),
 					api.WithAuthController(auth.NewStaticAuthController("TOKEN")),
 					api.WithLogger(logger.NewDiscardLogger()),

api/integration/app/upgrade/apppreflight_test.go

@@ -448,13 +448,13 @@ func TestAppPreflightSuite(t *testing.T) {
 
 				// Create the API with runtime config in the API config
 				apiInstance, err := api.New(types.APIConfig{
-					Password: "password",
+					InstallTarget: types.InstallTargetLinux,
+					Password:      "password",
 					LinuxConfig: types.LinuxConfig{
 						RuntimeConfig: rc,
 					},
 					ReleaseData: rd,
 					Mode:        types.ModeUpgrade,
-					Target:      types.TargetLinux,
 				},
 					api.WithLinuxUpgradeController(controller),
 					api.WithAuthController(auth.NewStaticAuthController("TOKEN")),
@@ -487,14 +487,14 @@ func TestAppPreflightSuite(t *testing.T) {
 
 				// Create the API with kubernetes config in the API config
 				apiInstance, err := api.New(types.APIConfig{
-					Password: "password",
+					InstallTarget: types.InstallTargetKubernetes,
+					Password:      "password",
 					KubernetesConfig: types.KubernetesConfig{
 						RESTClientGetter: &genericclioptions.ConfigFlags{},
 						Installation:     mockInstallation,
 					},
 					ReleaseData: rd,
 					Mode:        types.ModeUpgrade,
-					Target:      types.TargetKubernetes,
 				},
 					api.WithKubernetesUpgradeController(controller),
 					api.WithAuthController(auth.NewStaticAuthController("TOKEN")),

api/integration/app/upgrade/config_test.go

@@ -363,10 +363,10 @@ func TestAppConfigSuite(t *testing.T) {
 				require.NoError(t, err)
 
 				apiInstance, err := api.New(types.APIConfig{
-					Password:    "password",
-					ReleaseData: releaseData,
-					Mode:        types.ModeUpgrade,
-					Target:      types.TargetLinux,
+					InstallTarget: types.InstallTargetLinux,
+					Password:      "password",
+					ReleaseData:   releaseData,
+					Mode:          types.ModeUpgrade,
 				},
 					api.WithLinuxUpgradeController(controller),
 					api.WithAuthController(auth.NewStaticAuthController("TOKEN")),
@@ -393,10 +393,10 @@ func TestAppConfigSuite(t *testing.T) {
 				require.NoError(t, err)
 
 				apiInstance, err := api.New(types.APIConfig{
-					Password:    "password",
-					ReleaseData: releaseData,
-					Mode:        types.ModeUpgrade,
-					Target:      types.TargetKubernetes,
+					InstallTarget: types.InstallTargetKubernetes,
+					Password:      "password",
+					ReleaseData:   releaseData,
+					Mode:          types.ModeUpgrade,
 				},
 					api.WithKubernetesUpgradeController(controller),
 					api.WithAuthController(auth.NewStaticAuthController("TOKEN")),