chore(api): pass kubernetes configuration (#2376)

Author: emosbaugh

api/integration/hostpreflights_test.go

@@ -220,8 +220,10 @@ func TestGetHostPreflightsStatusWithIgnoreFlag(t *testing.T) {
 			// Create the API with allow ignore host preflights flag
 			apiInstance, err := api.New(
 				types.APIConfig{
-					Password:                  "password",
-					AllowIgnoreHostPreflights: tt.allowIgnoreHostPreflights,
+					Password: "password",
+					LinuxConfig: types.LinuxConfig{
+						AllowIgnoreHostPreflights: tt.allowIgnoreHostPreflights,
+					},
 				},
 				api.WithLinuxInstallController(installController),
 				api.WithAuthController(&staticAuthController{"TOKEN"}),

api/types/api.go

@@ -2,19 +2,32 @@ package types
 
 import (
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
+	"github.com/replicatedhq/embedded-cluster/pkg/kubernetesinstallation"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
+	"k8s.io/client-go/rest"
 )
 
 // APIConfig holds the configuration for the API server
 type APIConfig struct {
+	Password      string
+	TLSConfig     TLSConfig
+	License       []byte
+	AirgapBundle  string
+	ConfigValues  string
+	ReleaseData   *release.ReleaseData
+	EndUserConfig *ecv1beta1.Config
+
+	LinuxConfig
+	KubernetesConfig
+}
+
+type LinuxConfig struct {
 	RuntimeConfig             runtimeconfig.RuntimeConfig
-	Password                  string
-	TLSConfig                 TLSConfig
-	License                   []byte
-	AirgapBundle              string
-	ConfigValues              string
-	ReleaseData               *release.ReleaseData
-	EndUserConfig             *ecv1beta1.Config
 	AllowIgnoreHostPreflights bool
 }
+
+type KubernetesConfig struct {
+	RESTConfig   *rest.Config
+	Installation kubernetesinstallation.Installation
+}

cmd/installer/cli/api.go

@@ -16,44 +16,37 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api"
 	apilogger "github.com/replicatedhq/embedded-cluster/api/pkg/logger"
 	apitypes "github.com/replicatedhq/embedded-cluster/api/types"
-	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/cloudutils"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/tlsutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
-	"github.com/replicatedhq/embedded-cluster/pkg/release"
-	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
 	"github.com/replicatedhq/embedded-cluster/web"
 	"github.com/sirupsen/logrus"
 )
 
 // apiOptions holds the configuration options for the API server
 type apiOptions struct {
-	InstallTarget             string
-	RuntimeConfig             runtimeconfig.RuntimeConfig
-	Logger                    logrus.FieldLogger
-	MetricsReporter           metrics.ReporterInterface
-	Password                  string
-	TLSConfig                 apitypes.TLSConfig
-	ManagerPort               int
-	License                   []byte
-	AirgapBundle              string
-	ConfigValues              string
-	ReleaseData               *release.ReleaseData
-	EndUserConfig             *ecv1beta1.Config
-	AllowIgnoreHostPreflights bool
-	WebAssetsFS               fs.FS
+	apitypes.APIConfig
+
+	ManagerPort   int
+	InstallTarget string
+
+	Logger          logrus.FieldLogger
+	MetricsReporter metrics.ReporterInterface
+	WebAssetsFS     fs.FS
 }
 
-func startAPI(ctx context.Context, cert tls.Certificate, opts apiOptions) error {
+func startAPI(ctx context.Context, cert tls.Certificate, opts apiOptions, cancel context.CancelFunc) error {
 	listener, err := net.Listen("tcp", fmt.Sprintf(":%d", opts.ManagerPort))
 	if err != nil {
 		return fmt.Errorf("unable to create listener: %w", err)
 	}
 
 	go func() {
+		// If the api exits, we want to exit the entire process
+		defer cancel()
 		if err := serveAPI(ctx, listener, cert, opts); err != nil {
 			if !errors.Is(err, http.ErrServerClosed) {
-				logrus.Errorf("api error: %v", err)
+				logrus.Errorf("API server exited with error: %v", err)
 			}
 		}
 	}()
@@ -81,20 +74,8 @@ func serveAPI(ctx context.Context, listener net.Listener, cert tls.Certificate,
 		return fmt.Errorf("new api logger: %w", err)
 	}
 
-	cfg := apitypes.APIConfig{
-		RuntimeConfig:             opts.RuntimeConfig,
-		Password:                  opts.Password,
-		TLSConfig:                 opts.TLSConfig,
-		License:                   opts.License,
-		AirgapBundle:              opts.AirgapBundle,
-		ConfigValues:              opts.ConfigValues,
-		ReleaseData:               opts.ReleaseData,
-		EndUserConfig:             opts.EndUserConfig,
-		AllowIgnoreHostPreflights: opts.AllowIgnoreHostPreflights,
-	}
-
 	api, err := api.New(
-		cfg,
+		opts.APIConfig,
 		api.WithLogger(logger),
 		api.WithMetricsReporter(opts.MetricsReporter),
 	)

cmd/installer/cli/api_test.go

@@ -12,6 +12,7 @@ import (
 	"time"
 
 	apilogger "github.com/replicatedhq/embedded-cluster/api/pkg/logger"
+	apitypes "github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/tlsutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
@@ -55,15 +56,17 @@ func Test_serveAPI(t *testing.T) {
 	require.NoError(t, err)
 
 	config := apiOptions{
-		Logger:      apilogger.NewDiscardLogger(),
-		Password:    "password",
-		ManagerPort: portInt,
-		WebAssetsFS: webAssetsFS,
-		ReleaseData: &release.ReleaseData{
-			Application: &kotsv1beta1.Application{
-				Spec: kotsv1beta1.ApplicationSpec{},
+		APIConfig: apitypes.APIConfig{
+			Password: "password",
+			ReleaseData: &release.ReleaseData{
+				Application: &kotsv1beta1.Application{
+					Spec: kotsv1beta1.ApplicationSpec{},
+				},
 			},
 		},
+		ManagerPort: portInt,
+		Logger:      apilogger.NewDiscardLogger(),
+		WebAssetsFS: webAssetsFS,
 	}
 
 	go func() {

cmd/installer/cli/install.go

@@ -34,6 +34,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/extensions"
 	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
+	"github.com/replicatedhq/embedded-cluster/pkg/kubernetesinstallation"
 	"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/netutils"
@@ -102,7 +103,9 @@ func InstallCmd(ctx context.Context, name string) *cobra.Command {
 	var flags InstallCmdFlags
 
 	ctx, cancel := context.WithCancel(ctx)
+
 	rc := runtimeconfig.New(nil)
+	ki := kubernetesinstallation.New(nil)
 
 	short := fmt.Sprintf("Install %s", name)
 	if os.Getenv("ENABLE_V3") == "1" {
@@ -121,7 +124,7 @@ func InstallCmd(ctx context.Context, name string) *cobra.Command {
 			if err := verifyAndPrompt(ctx, name, flags, prompts.New()); err != nil {
 				return err
 			}
-			if err := preRunInstall(cmd, &flags, rc); err != nil {
+			if err := preRunInstall(cmd, &flags, rc, ki); err != nil {
 				return err
 			}
 
@@ -133,7 +136,7 @@ func InstallCmd(ctx context.Context, name string) *cobra.Command {
 			installReporter.ReportInstallationStarted(ctx)
 
 			if flags.enableManagerExperience {
-				return runManagerExperienceInstall(ctx, flags, rc, installReporter)
+				return runManagerExperienceInstall(ctx, flags, rc, ki, installReporter)
 			}
 
 			_ = rc.SetEnv()
@@ -366,26 +369,26 @@ func addManagerExperienceFlags(cmd *cobra.Command, flags *InstallCmdFlags) error
 	return nil
 }
 
-func preRunInstall(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimeconfig.RuntimeConfig) error {
+func preRunInstall(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimeconfig.RuntimeConfig, ki kubernetesinstallation.Installation) error {
 	if !slices.Contains([]string{"linux", "kubernetes"}, flags.target) {
 		return fmt.Errorf(`invalid target (must be one of: "linux", "kubernetes")`)
 	}
 
-	if err := preRunInstallCommon(cmd, flags, rc); err != nil {
+	if err := preRunInstallCommon(cmd, flags, rc, ki); err != nil {
 		return err
 	}
 
 	switch flags.target {
 	case "linux":
 		return preRunInstallLinux(cmd, flags, rc)
 	case "kubernetes":
-		return preRunInstallKubernetes(cmd, flags)
+		return preRunInstallKubernetes(cmd, flags, ki)
 	}
 
 	return nil
 }
 
-func preRunInstallCommon(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimeconfig.RuntimeConfig) error {
+func preRunInstallCommon(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimeconfig.RuntimeConfig, ki kubernetesinstallation.Installation) error {
 	// license file can be empty for restore
 	if flags.licenseFile != "" {
 		b, err := os.ReadFile(flags.licenseFile)
@@ -415,6 +418,12 @@ func preRunInstallCommon(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimec
 
 	flags.isAirgap = flags.airgapBundle != ""
 
+	if flags.managerPort != 0 && flags.adminConsolePort != 0 {
+		if flags.managerPort == flags.adminConsolePort {
+			return fmt.Errorf("manager port cannot be the same as admin console port")
+		}
+	}
+
 	proxy, err := proxyConfigFromCmd(cmd, flags.assumeYes)
 	if err != nil {
 		return err
@@ -427,8 +436,14 @@ func preRunInstallCommon(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimec
 		}
 	}
 
-	// TODO: runtimeconfig is only relevant for linux installs
+	rc.SetAdminConsolePort(flags.adminConsolePort)
+	ki.SetAdminConsolePort(flags.adminConsolePort)
+
+	rc.SetManagerPort(flags.managerPort)
+	ki.SetManagerPort(flags.managerPort)
+
 	rc.SetProxySpec(proxy)
+	ki.SetProxySpec(proxy)
 
 	return nil
 }
@@ -485,14 +500,13 @@ func preRunInstallLinux(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimeco
 	// TODO: validate that a single port isn't used for multiple services
 	rc.SetDataDir(flags.dataDir)
 	rc.SetLocalArtifactMirrorPort(flags.localArtifactMirrorPort)
-	rc.SetAdminConsolePort(flags.adminConsolePort)
 	rc.SetHostCABundlePath(hostCABundlePath)
 	rc.SetNetworkSpec(networkSpec)
 
 	return nil
 }
 
-func preRunInstallKubernetes(_ *cobra.Command, flags *InstallCmdFlags) error {
+func preRunInstallKubernetes(_ *cobra.Command, flags *InstallCmdFlags, _ kubernetesinstallation.Installation) error {
 	// If set, validate that the kubeconfig file exists and can be read
 	if flags.kubernetesEnvSettings.KubeConfig != "" {
 		if _, err := os.Stat(flags.kubernetesEnvSettings.KubeConfig); os.IsNotExist(err) {
@@ -545,7 +559,7 @@ func cidrConfigFromCmd(cmd *cobra.Command) (*newconfig.CIDRConfig, error) {
 	return cidrCfg, nil
 }
 
-func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, installReporter *InstallReporter) (finalErr error) {
+func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, ki kubernetesinstallation.Installation, installReporter *InstallReporter) (finalErr error) {
 	// this is necessary because the api listens on all interfaces,
 	// and we only know the interface to use when the user selects it in the ui
 	ipAddresses, err := netutils.ListAllValidIPAddresses()
@@ -602,30 +616,44 @@ func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc
 	}
 
 	apiConfig := apiOptions{
+		APIConfig: apitypes.APIConfig{
+			Password: flags.adminConsolePassword,
+			TLSConfig: apitypes.TLSConfig{
+				CertBytes: flags.tlsCertBytes,
+				KeyBytes:  flags.tlsKeyBytes,
+				Hostname:  flags.hostname,
+			},
+			License:       flags.licenseBytes,
+			AirgapBundle:  flags.airgapBundle,
+			ConfigValues:  flags.configValues,
+			ReleaseData:   release.GetReleaseData(),
+			EndUserConfig: eucfg,
+
+			LinuxConfig: apitypes.LinuxConfig{
+				RuntimeConfig:             rc,
+				AllowIgnoreHostPreflights: flags.ignoreHostPreflights,
+			},
+			KubernetesConfig: apitypes.KubernetesConfig{
+				RESTConfig:   flags.installConfig.kubernetesRestConfig,
+				Installation: ki,
+			},
+		},
+
+		ManagerPort:     flags.managerPort,
 		InstallTarget:   flags.target,
-		RuntimeConfig:   rc,
 		MetricsReporter: installReporter.reporter,
-		Password:        flags.adminConsolePassword,
-		TLSConfig: apitypes.TLSConfig{
-			CertBytes: flags.tlsCertBytes,
-			KeyBytes:  flags.tlsKeyBytes,
-			Hostname:  flags.hostname,
-		},
-		ManagerPort:               flags.managerPort,
-		License:                   flags.licenseBytes,
-		AirgapBundle:              flags.airgapBundle,
-		ConfigValues:              flags.configValues,
-		ReleaseData:               release.GetReleaseData(),
-		EndUserConfig:             eucfg,
-		AllowIgnoreHostPreflights: flags.ignoreHostPreflights,
 	}
 
-	if err := startAPI(ctx, flags.tlsCert, apiConfig); err != nil {
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	if err := startAPI(ctx, flags.tlsCert, apiConfig, cancel); err != nil {
 		return fmt.Errorf("unable to start api: %w", err)
 	}
 
-	// TODO: add app name to this message (e.g., App Name manager)
-	logrus.Infof("\nVisit the manager to continue: %s\n", getManagerURL(flags.hostname, flags.managerPort))
+	logrus.Infof("\nVisit the %s manager to continue: %s\n",
+		runtimeconfig.BinaryName(),
+		getManagerURL(flags.hostname, flags.managerPort))
 	<-ctx.Done()
 
 	return nil

cmd/installer/cli/install_runpreflights.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/replicatedhq/embedded-cluster/pkg-new/hostutils"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/preflights"
+	"github.com/replicatedhq/embedded-cluster/pkg/kubernetesinstallation"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/netutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/prompts"
@@ -23,14 +24,16 @@ var ErrPreflightsHaveFail = metrics.NewErrorNoFail(fmt.Errorf("host preflight fa
 
 func InstallRunPreflightsCmd(ctx context.Context, name string) *cobra.Command {
 	var flags InstallCmdFlags
+
 	rc := runtimeconfig.New(nil)
+	ki := kubernetesinstallation.New(nil)
 
 	cmd := &cobra.Command{
 		Use:    "run-preflights",
 		Short:  "Run install host preflights",
 		Hidden: true,
 		PreRunE: func(cmd *cobra.Command, args []string) error {
-			if err := preRunInstall(cmd, &flags, rc); err != nil {
+			if err := preRunInstall(cmd, &flags, rc, ki); err != nil {
 				return err
 			}
 

cmd/installer/cli/restore.go

@@ -29,6 +29,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/disasterrecovery"
 	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
+	"github.com/replicatedhq/embedded-cluster/pkg/kubernetesinstallation"
 	"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/netutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/prompts"
@@ -92,12 +93,13 @@ func RestoreCmd(ctx context.Context, name string) *cobra.Command {
 	var skipStoreValidation bool
 
 	rc := runtimeconfig.New(nil)
+	ki := kubernetesinstallation.New(nil)
 
 	cmd := &cobra.Command{
 		Use:   "restore",
 		Short: fmt.Sprintf("Restore %s from a backup", name),
 		PreRunE: func(cmd *cobra.Command, args []string) error {
-			if err := preRunInstall(cmd, &flags, rc); err != nil {
+			if err := preRunInstall(cmd, &flags, rc, ki); err != nil {
 				return err
 			}