feat(kubernetes): adminconsole install (#2402)

* feat(kubernetes): adminconsole install

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

* f

Author: emosbaugh

api/controllers/linux/install/controller.go

@@ -52,6 +52,7 @@ type InstallController struct {
 	airgapBundle              string
 	configValues              string
 	endUserConfig             *ecv1beta1.Config
+	clusterID                 string
 	store                     store.Store
 	rc                        runtimeconfig.RuntimeConfig
 	stateMachine              statemachine.Interface
@@ -134,6 +135,12 @@ func WithEndUserConfig(endUserConfig *ecv1beta1.Config) InstallControllerOption
 	}
 }
 
+func WithClusterID(clusterID string) InstallControllerOption {
+	return func(c *InstallController) {
+		c.clusterID = clusterID
+	}
+}
+
 func WithAllowIgnoreHostPreflights(allowIgnoreHostPreflights bool) InstallControllerOption {
 	return func(c *InstallController) {
 		c.allowIgnoreHostPreflights = allowIgnoreHostPreflights
@@ -225,6 +232,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			infra.WithConfigValues(controller.configValues),
 			infra.WithReleaseData(controller.releaseData),
 			infra.WithEndUserConfig(controller.endUserConfig),
+			infra.WithClusterID(controller.clusterID),
 		)
 	}
 

api/internal/handlers/linux/linux.go

@@ -78,6 +78,7 @@ func New(cfg types.APIConfig, opts ...Option) (*Handler, error) {
 			install.WithAirgapBundle(h.cfg.AirgapBundle),
 			install.WithConfigValues(h.cfg.ConfigValues),
 			install.WithEndUserConfig(h.cfg.EndUserConfig),
+			install.WithClusterID(h.cfg.ClusterID),
 			install.WithAllowIgnoreHostPreflights(h.cfg.AllowIgnoreHostPreflights),
 		)
 		if err != nil {

api/internal/managers/linux/infra/install.go

@@ -225,6 +225,7 @@ func (m *infraManager) recordInstallation(ctx context.Context, kcli client.Clien
 	// record the installation
 	logFn("recording installation")
 	in, err := kubeutils.RecordInstallation(ctx, kcli, kubeutils.RecordInstallationOptions{
+		ClusterID:      m.clusterID,
 		IsAirgap:       m.airgapBundle != "",
 		License:        license,
 		ConfigSpec:     m.getECConfigSpec(),
@@ -290,6 +291,7 @@ func (m *infraManager) getAddonInstallOpts(license *kotsv1beta1.License, rc runt
 	ecDomains := utils.GetDomains(m.releaseData)
 
 	opts := addons.InstallOptions{
+		ClusterID:               m.clusterID,
 		AdminConsolePwd:         m.password,
 		AdminConsolePort:        rc.AdminConsolePort(),
 		License:                 license,
@@ -318,6 +320,7 @@ func (m *infraManager) getAddonInstallOpts(license *kotsv1beta1.License, rc runt
 				AppSlug:               license.Spec.AppSlug,
 				License:               m.license,
 				Namespace:             constants.KotsadmNamespace,
+				ClusterID:             m.clusterID,
 				AirgapBundle:          m.airgapBundle,
 				ConfigValuesFile:      m.configValues,
 				ReplicatedAppEndpoint: netutils.MaybeAddHTTPS(ecDomains.ReplicatedAppDomain),

api/internal/managers/linux/infra/manager.go

@@ -36,6 +36,7 @@ type infraManager struct {
 	configValues  string
 	releaseData   *release.ReleaseData
 	endUserConfig *ecv1beta1.Config
+	clusterID     string
 	logger        logrus.FieldLogger
 	k0scli        k0s.K0sInterface
 	kcli          client.Client
@@ -102,6 +103,12 @@ func WithEndUserConfig(endUserConfig *ecv1beta1.Config) InfraManagerOption {
 	}
 }
 
+func WithClusterID(clusterID string) InfraManagerOption {
+	return func(c *infraManager) {
+		c.clusterID = clusterID
+	}
+}
+
 func WithK0s(k0s k0s.K0sInterface) InfraManagerOption {
 	return func(c *infraManager) {
 		c.k0scli = k0s

api/types/api.go

@@ -17,6 +17,7 @@ type APIConfig struct {
 	ConfigValues  string
 	ReleaseData   *release.ReleaseData
 	EndUserConfig *ecv1beta1.Config
+	ClusterID     string
 
 	LinuxConfig
 	KubernetesConfig

cmd/installer/cli/api_test.go

@@ -63,6 +63,7 @@ func Test_serveAPI(t *testing.T) {
 					Spec: kotsv1beta1.ApplicationSpec{},
 				},
 			},
+			ClusterID: "123",
 		},
 		ManagerPort: portInt,
 		Logger:      apilogger.NewDiscardLogger(),

cmd/installer/cli/enable_ha.go

@@ -111,6 +111,7 @@ func runEnableHA(ctx context.Context, rc runtimeconfig.RuntimeConfig) error {
 	defer loading.Close()
 
 	opts := addons.EnableHAOptions{
+		ClusterID:          in.Spec.ClusterID,
 		AdminConsolePort:   rc.AdminConsolePort(),
 		IsAirgap:           in.Spec.AirGap,
 		IsMultiNodeEnabled: in.Spec.LicenseInfo != nil && in.Spec.LicenseInfo.IsMultiNodeEnabled,

cmd/installer/cli/install.go

@@ -14,6 +14,7 @@ import (
 	"time"
 
 	"github.com/AlecAivazis/survey/v2/terminal"
+	"github.com/google/uuid"
 	k0sv1beta1 "github.com/k0sproject/k0s/pkg/apis/k0s/v1beta1"
 	apitypes "github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/cmd/installer/kotscli"
@@ -37,7 +38,6 @@ import (
 	"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"
 	"github.com/replicatedhq/embedded-cluster/pkg/prompts"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
@@ -87,6 +87,7 @@ type InstallCmdFlags struct {
 }
 
 type installConfig struct {
+	clusterID    string
 	license      *kotsv1beta1.License
 	licenseBytes []byte
 	tlsCert      tls.Certificate
@@ -129,10 +130,9 @@ func InstallCmd(ctx context.Context, appSlug, appTitle string) *cobra.Command {
 				return err
 			}
 
-			clusterID := metrics.ClusterID()
 			installReporter := newInstallReporter(
-				replicatedAppURL(), clusterID, cmd.CalledAs(), flagsToStringSlice(cmd.Flags()),
-				flags.license.Spec.LicenseID, flags.license.Spec.AppSlug,
+				replicatedAppURL(), cmd.CalledAs(), flagsToStringSlice(cmd.Flags()),
+				flags.license.Spec.LicenseID, flags.clusterID, flags.license.Spec.AppSlug,
 			)
 			installReporter.ReportInstallationStarted(ctx)
 
@@ -378,6 +378,8 @@ func preRunInstall(cmd *cobra.Command, flags *InstallCmdFlags, rc runtimeconfig.
 		return fmt.Errorf(`invalid --target (must be one of: "linux", "kubernetes")`)
 	}
 
+	flags.clusterID = uuid.New().String()
+
 	if err := preRunInstallCommon(cmd, flags, rc, ki); err != nil {
 		return err
 	}
@@ -562,7 +564,10 @@ func cidrConfigFromCmd(cmd *cobra.Command) (*newconfig.CIDRConfig, error) {
 	return cidrCfg, nil
 }
 
-func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, ki kubernetesinstallation.Installation, installReporter *InstallReporter, appTitle string) (finalErr error) {
+func runManagerExperienceInstall(
+	ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, ki kubernetesinstallation.Installation,
+	installReporter *InstallReporter, appTitle string,
+) (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()
@@ -631,6 +636,7 @@ func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc
 			ConfigValues:  flags.configValues,
 			ReleaseData:   release.GetReleaseData(),
 			EndUserConfig: eucfg,
+			ClusterID:     flags.clusterID,
 
 			LinuxConfig: apitypes.LinuxConfig{
 				RuntimeConfig:             rc,
@@ -697,7 +703,7 @@ func runInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.Run
 	errCh := kubeutils.WaitForKubernetes(ctx, kcli)
 	defer logKubernetesErrors(errCh)
 
-	in, err := recordInstallation(ctx, kcli, flags, rc, flags.license)
+	in, err := recordInstallation(ctx, kcli, flags, rc)
 	if err != nil {
 		return fmt.Errorf("unable to record installation: %w", err)
 	}
@@ -733,7 +739,7 @@ func runInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.Run
 	defer hcli.Close()
 
 	logrus.Debugf("installing addons")
-	if err := installAddons(ctx, kcli, mcli, hcli, rc, flags); err != nil {
+	if err := installAddons(ctx, kcli, mcli, hcli, flags, rc); err != nil {
 		return err
 	}
 
@@ -771,6 +777,7 @@ func getAddonInstallOpts(flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig,
 	}
 
 	opts := &addons.InstallOptions{
+		ClusterID:               flags.clusterID,
 		AdminConsolePwd:         flags.adminConsolePassword,
 		AdminConsolePort:        rc.AdminConsolePort(),
 		License:                 flags.license,
@@ -794,6 +801,7 @@ func getAddonInstallOpts(flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig,
 				AppSlug:               flags.license.Spec.AppSlug,
 				License:               flags.licenseBytes,
 				Namespace:             constants.KotsadmNamespace,
+				ClusterID:             flags.clusterID,
 				AirgapBundle:          flags.airgapBundle,
 				ConfigValuesFile:      flags.configValues,
 				ReplicatedAppEndpoint: replicatedAppURL(),
@@ -1068,7 +1076,7 @@ func installAndStartCluster(ctx context.Context, flags InstallCmdFlags, rc runti
 	return cfg, nil
 }
 
-func installAddons(ctx context.Context, kcli client.Client, mcli metadata.Interface, hcli helm.Client, rc runtimeconfig.RuntimeConfig, flags InstallCmdFlags) error {
+func installAddons(ctx context.Context, kcli client.Client, mcli metadata.Interface, hcli helm.Client, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig) error {
 	progressChan := make(chan addontypes.AddOnProgress)
 	defer close(progressChan)
 
@@ -1294,7 +1302,7 @@ func waitForNode(ctx context.Context) error {
 }
 
 func recordInstallation(
-	ctx context.Context, kcli client.Client, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, license *kotsv1beta1.License,
+	ctx context.Context, kcli client.Client, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig,
 ) (*ecv1beta1.Installation, error) {
 	// get the embedded cluster config
 	cfg := release.GetEmbeddedClusterConfig()
@@ -1311,8 +1319,9 @@ func recordInstallation(
 
 	// record the installation
 	installation, err := kubeutils.RecordInstallation(ctx, kcli, kubeutils.RecordInstallationOptions{
+		ClusterID:      flags.clusterID,
 		IsAirgap:       flags.isAirgap,
-		License:        license,
+		License:        flags.license,
 		ConfigSpec:     cfgspec,
 		MetricsBaseURL: replicatedAppURL(),
 		RuntimeConfig:  rc.Get(),

cmd/installer/cli/join.go

@@ -78,7 +78,7 @@ func JoinCmd(ctx context.Context, appSlug, appTitle string) *cobra.Command {
 				return fmt.Errorf("unable to get join token: %w", err)
 			}
 			joinReporter := newJoinReporter(
-				jcmd.InstallationSpec.MetricsBaseURL, jcmd.ClusterID, cmd.CalledAs(), flagsToStringSlice(cmd.Flags()),
+				jcmd.InstallationSpec.MetricsBaseURL, jcmd.ClusterID.String(), cmd.CalledAs(), flagsToStringSlice(cmd.Flags()),
 			)
 			joinReporter.ReportJoinStarted(ctx)
 
@@ -657,6 +657,7 @@ func maybeEnableHA(ctx context.Context, kcli client.Client, mcli metadata.Interf
 	defer loading.Close()
 
 	opts := addons.EnableHAOptions{
+		ClusterID:          jcmd.InstallationSpec.ClusterID,
 		AdminConsolePort:   rc.AdminConsolePort(),
 		IsAirgap:           jcmd.InstallationSpec.AirGap,
 		IsMultiNodeEnabled: jcmd.InstallationSpec.LicenseInfo != nil && jcmd.InstallationSpec.LicenseInfo.IsMultiNodeEnabled,

cmd/installer/cli/metrics.go

@@ -16,7 +16,7 @@ type InstallReporter struct {
 	appSlug   string
 }
 
-func newInstallReporter(baseURL string, clusterID uuid.UUID, cmd string, args []string, licenseID string, appSlug string) *InstallReporter {
+func newInstallReporter(baseURL string, cmd string, args []string, licenseID string, clusterID string, appSlug string) *InstallReporter {
 	executionID := uuid.New().String()
 	reporter := metrics.NewReporter(executionID, baseURL, clusterID, cmd, args)
 	return &InstallReporter{
@@ -54,7 +54,7 @@ type JoinReporter struct {
 	reporter metrics.ReporterInterface
 }
 
-func newJoinReporter(baseURL string, clusterID uuid.UUID, cmd string, flags []string) *JoinReporter {
+func newJoinReporter(baseURL string, clusterID string, cmd string, flags []string) *JoinReporter {
 	executionID := uuid.New().String()
 	reporter := metrics.NewReporter(executionID, baseURL, clusterID, cmd, flags)
 	return &JoinReporter{