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

Author: laverya

.github/workflows/release-prod.yaml

@@ -171,6 +171,7 @@ jobs:
             VERSION=${{ needs.get-tag.outputs.tag-name }} \
             LOCAL_ARTIFACT_MIRROR_IMAGE=proxy.replicated.com/anonymous/${{ needs.publish-images.outputs.local-artifact-mirror }}
           tar -C output/bin -czvf build/embedded-cluster-linux-amd64.tgz embedded-cluster
+          tar -C output/bins -czvf build/manager-linux-amd64.tgz manager
 
       - name: Output Metadata
         run: |

Makefile

@@ -28,6 +28,7 @@ LOCAL_ARTIFACT_MIRROR_IMAGE ?= proxy.replicated.com/anonymous/replicated/embedde
 # These are used to override the binary urls in dev and e2e tests
 METADATA_K0S_BINARY_URL_OVERRIDE =
 METADATA_KOTS_BINARY_URL_OVERRIDE =
+METADATA_MANAGER_BINARY_URL_OVERRIDE =
 METADATA_OPERATOR_BINARY_URL_OVERRIDE =
 
 ifeq ($(K0S_VERSION),v1.30.5+k0s.0-ec.1)
@@ -49,6 +50,7 @@ LD_FLAGS = \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.LocalArtifactMirrorImage=$(LOCAL_ARTIFACT_MIRROR_IMAGE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.K0sBinaryURLOverride=$(METADATA_K0S_BINARY_URL_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.KOTSBinaryURLOverride=$(METADATA_KOTS_BINARY_URL_OVERRIDE) \
+	-X github.com/replicatedhq/embedded-cluster/pkg/versions.ManagerBinaryURLOverride=$(METADATA_MANAGER_BINARY_URL_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.OperatorBinaryURLOverride=$(METADATA_OPERATOR_BINARY_URL_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartRepoOverride=$(ADMIN_CONSOLE_CHART_REPO_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.KurlProxyImageOverride=$(ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE) \

cmd/installer/cli/install.go

@@ -23,7 +23,9 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/dryrun"
 	"github.com/replicatedhq/embedded-cluster/pkg/goods"
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
+	"github.com/replicatedhq/embedded-cluster/pkg/helpers/systemd"
 	"github.com/replicatedhq/embedded-cluster/pkg/k0s"
+	"github.com/replicatedhq/embedded-cluster/pkg/manager"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/netutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/preflights"
@@ -564,6 +566,7 @@ func gatherVersionMetadata(k0sCfg *k0sconfig.ClusterConfig, withChannelRelease b
 	artifacts := map[string]string{
 		"k0s":                         fmt.Sprintf("k0s-binaries/%s-%s", versions.K0sVersion, runtime.GOARCH),
 		"kots":                        fmt.Sprintf("kots-binaries/%s-%s.tar.gz", adminconsole.KotsVersion, runtime.GOARCH),
+		"manager":                     fmt.Sprintf("manager-binaries/%s-%s.tar.gz", versions.Version, runtime.GOARCH),
 		"operator":                    fmt.Sprintf("operator-binaries/%s-%s.tar.gz", embeddedclusteroperator.Metadata.Version, runtime.GOARCH),
 		"local-artifact-mirror-image": versions.LocalArtifactMirrorImage,
 	}
@@ -573,6 +576,9 @@ func gatherVersionMetadata(k0sCfg *k0sconfig.ClusterConfig, withChannelRelease b
 	if versions.KOTSBinaryURLOverride != "" {
 		artifacts["kots"] = versions.KOTSBinaryURLOverride
 	}
+	if versions.ManagerBinaryURLOverride != "" {
+		artifacts["manager"] = versions.ManagerBinaryURLOverride
+	}
 	if versions.OperatorBinaryURLOverride != "" {
 		artifacts["operator"] = versions.OperatorBinaryURLOverride
 	}
@@ -827,28 +833,14 @@ func installAndEnableLocalArtifactMirror() error {
 
 // installAndEnableManager installs and enables the manager. This service is
 // responsible for managing the embedded cluster after the initial installation.
-func installAndEnableManager() error {
-	materializer := goods.NewMaterializer()
-	if err := materializer.ManagerUnitFile(); err != nil {
-		return fmt.Errorf("unable to materialize manager unit: %w", err)
-	}
-	if err := writeManagerDropInFile(); err != nil {
-		return fmt.Errorf("unable to write manager environment file: %w", err)
-	}
-	if _, err := helpers.RunCommand("systemctl", "daemon-reload"); err != nil {
-		return fmt.Errorf("unable to get reload systemctl daemon: %w", err)
-	}
-	if _, err := helpers.RunCommand("systemctl", "start", runtimeconfig.ManagerServiceName); err != nil {
-		return fmt.Errorf("unable to start the manager: %w", err)
-	}
-	if _, err := helpers.RunCommand("systemctl", "enable", runtimeconfig.ManagerServiceName); err != nil {
-		return fmt.Errorf("unable to start the manager service: %w", err)
+func installAndEnableManager(ctx context.Context) error {
+	if err := manager.Install(ctx, logrus.Debugf); err != nil {
+		return fmt.Errorf("failed to install manager service: %w", err)
 	}
 	return nil
 }
 
 const (
-	localArtifactMirrorSystemdConfFile    = "/etc/systemd/system/local-artifact-mirror.service.d/embedded-cluster.conf"
 	localArtifactMirrorDropInFileContents = `[Service]
 Environment="LOCAL_ARTIFACT_MIRROR_PORT=%d"
 Environment="LOCAL_ARTIFACT_MIRROR_DATA_DIR=%s"
@@ -858,47 +850,16 @@ ExecStart=%s serve
 `
 )
 
-var (
-	managerSystemdConfFile    = fmt.Sprintf("/etc/systemd/system/%s.service.d/embedded-cluster.conf", runtimeconfig.ManagerServiceName)
-	managerDropInFileContents = `[Service]
-# Empty ExecStart= will clear out the previous ExecStart value
-ExecStart=
-ExecStart=%s start
-`
-)
-
 func writeLocalArtifactMirrorDropInFile() error {
-	dir := filepath.Dir(localArtifactMirrorSystemdConfFile)
-	err := os.MkdirAll(dir, 0755)
-	if err != nil {
-		return fmt.Errorf("create directory: %w", err)
-	}
 	contents := fmt.Sprintf(
 		localArtifactMirrorDropInFileContents,
 		runtimeconfig.LocalArtifactMirrorPort(),
 		runtimeconfig.EmbeddedClusterHomeDirectory(),
 		runtimeconfig.PathToEmbeddedClusterBinary("local-artifact-mirror"),
 	)
-	err = os.WriteFile(localArtifactMirrorSystemdConfFile, []byte(contents), 0644)
-	if err != nil {
-		return fmt.Errorf("write file: %w", err)
-	}
-	return nil
-}
-
-func writeManagerDropInFile() error {
-	dir := filepath.Dir(managerSystemdConfFile)
-	err := os.MkdirAll(dir, 0755)
-	if err != nil {
-		return fmt.Errorf("create directory: %w", err)
-	}
-	contents := fmt.Sprintf(
-		managerDropInFileContents,
-		runtimeconfig.PathToEmbeddedClusterBinary("manager"),
-	)
-	err = os.WriteFile(managerSystemdConfFile, []byte(contents), 0644)
+	err := systemd.WriteDropInFile("local-artifact-mirror.service", "embedded-cluster.conf", []byte(contents))
 	if err != nil {
-		return fmt.Errorf("write file: %w", err)
+		return fmt.Errorf("write drop-in file: %w", err)
 	}
 	return nil
 }

cmd/installer/cli/install2.go

@@ -262,7 +262,7 @@ func runInstall2(cmd *cobra.Command, args []string, name string, flags Install2C
 	}
 
 	logrus.Debugf("installing manager")
-	if err := installAndEnableManager(); err != nil {
+	if err := installAndEnableManager(cmd.Context()); err != nil {
 		metrics.ReportApplyFinished(cmd.Context(), "", flags.license, err)
 		return err
 	}

cmd/installer/cli/join.go

@@ -267,7 +267,7 @@ func JoinCmd(ctx context.Context, name string) *cobra.Command {
 			}
 
 			logrus.Debugf("installing manager")
-			if err := installAndEnableManager(); err != nil {
+			if err := installAndEnableManager(cmd.Context()); err != nil {
 				err := fmt.Errorf("unable to install and enable manager: %w", err)
 				metrics.ReportJoinFailed(cmd.Context(), jcmd.InstallationSpec.MetricsBaseURL, jcmd.ClusterID, err)
 				return err

cmd/installer/cli/join2.go

@@ -163,7 +163,7 @@ func runJoin2(cmd *cobra.Command, args []string, name string, flags Join2CmdFlag
 	}
 
 	logrus.Debugf("installing manager")
-	if err := installAndEnableManager(); err != nil {
+	if err := installAndEnableManager(cmd.Context()); err != nil {
 		err := fmt.Errorf("unable to install and enable manager: %w", err)
 		metrics.ReportJoinFailed(cmd.Context(), jcmd.InstallationSpec.MetricsBaseURL, jcmd.ClusterID, err)
 		return err

cmd/installer/cli/reset.go

@@ -14,6 +14,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
 	"github.com/replicatedhq/embedded-cluster/pkg/k0s"
 	"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
+	"github.com/replicatedhq/embedded-cluster/pkg/manager"
 	"github.com/replicatedhq/embedded-cluster/pkg/prompts"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
 	rcutil "github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig/util"
@@ -182,12 +183,8 @@ func ResetCmd(ctx context.Context, name string) *cobra.Command {
 				return fmt.Errorf("failed to remove logs directory: %w", err)
 			}
 
-			if err := helpers.RemoveAll(runtimeconfig.PathToK0sContainerdConfig()); err != nil {
-				return fmt.Errorf("failed to remove containerd config: %w", err)
-			}
-
-			if err := helpers.RemoveAll(systemdUnitFileName()); err != nil {
-				return fmt.Errorf("failed to remove systemd unit file: %w", err)
+			if err := manager.Uninstall(cmd.Context(), logrus.Debugf); err != nil {
+				return fmt.Errorf("failed to uninstall manager service: %w", err)
 			}
 
 			if err := helpers.RemoveAll(runtimeconfig.EmbeddedClusterOpenEBSLocalSubDir()); err != nil {

cmd/installer/cli/restore.go

@@ -386,7 +386,7 @@ func RestoreCmd(ctx context.Context, name string) *cobra.Command {
 				}
 
 				logrus.Debugf("installing manager")
-				if err := installAndEnableManager(); err != nil {
+				if err := installAndEnableManager(cmd.Context()); err != nil {
 					return fmt.Errorf("unable to install manager: %w", err)
 				}
 
@@ -1261,7 +1261,7 @@ func waitForDRComponent(ctx context.Context, drComponent disasterRecoveryCompone
 			return fmt.Errorf("unable to create kube client: %w", err)
 		}
 
-		if err := kubeutils.WaitForDeployment(ctx, kcli, runtimeconfig.RegistryNamespace, "registry"); err != nil {
+		if err := kubeutils.WaitForDeployment(ctx, kcli, runtimeconfig.RegistryNamespace, "registry", nil); err != nil {
 			return fmt.Errorf("unable to wait for registry to be ready: %w", err)
 		}
 	} else if drComponent == disasterRecoveryComponentECO {
@@ -1297,10 +1297,6 @@ func waitForDRComponent(ctx context.Context, drComponent disasterRecoveryCompone
 // restoreFromReplicatedBackup restores a disaster recovery component from a backup.
 func restoreFromReplicatedBackup(ctx context.Context, backup disasterrecovery.ReplicatedBackup, drComponent disasterRecoveryComponent) error {
 	if drComponent == disasterRecoveryComponentApp {
-		b := backup.GetAppBackup()
-		if b == nil {
-			return fmt.Errorf("unable to find app backup")
-		}
 		isImprovedDR, err := usesImprovedDR()
 		if err != nil {
 			return fmt.Errorf("failed to check if improved dr is enabled: %w", err)
@@ -1309,19 +1305,19 @@ func restoreFromReplicatedBackup(ctx context.Context, backup disasterrecovery.Re
 		// the vendor. Otherwise, we use the "replicated.com/disaster-recovery" label to discover
 		// the application resources in the cluster.
 		if isImprovedDR {
+			b := backup.GetAppBackup()
+			if b == nil {
+				return fmt.Errorf("unable to find app backup")
+			}
 			r, err := backup.GetRestore()
 			if err != nil {
-				return fmt.Errorf("failed to get restore cr from backup: %w", err)
+				return fmt.Errorf("failed to get restore resource from backup: %w", err)
 			}
 			err = restoreAppFromBackup(ctx, b, r)
-			if err != nil {
-				return fmt.Errorf("failed to restore app from backup using improved dr: %w", err)
-			}
-		} else {
-			err = restoreFromBackup(ctx, b, drComponent)
 			if err != nil {
 				return fmt.Errorf("failed to restore app from backup: %w", err)
 			}
+			return nil
 		}
 	}
 	b := backup.GetInfraBackup()

cmd/installer/cli/root.go

@@ -6,7 +6,9 @@ import (
 	"os"
 
 	"github.com/replicatedhq/embedded-cluster/pkg/dryrun"
+	"github.com/replicatedhq/embedded-cluster/pkg/manager"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
+	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/spf13/cobra"
 )
 
@@ -32,6 +34,8 @@ func RootCmd(ctx context.Context, name string) *cobra.Command {
 				}
 			}
 
+			setManagerServiceName()
+
 			return nil
 		},
 		PersistentPostRunE: func(cmd *cobra.Command, args []string) error {
@@ -65,3 +69,15 @@ func RootCmd(ctx context.Context, name string) *cobra.Command {
 
 	return cmd
 }
+
+// setManagerServiceName sets the manager service name based on the app slug in the embedded
+// channel release.
+func setManagerServiceName() {
+	rel, err := release.GetChannelRelease()
+	if err != nil {
+		panic(fmt.Errorf("unable to get channel release: %w", err))
+	}
+	if rel != nil {
+		manager.SetServiceName(rel.AppSlug)
+	}
+}

cmd/manager/start.go

@@ -37,9 +37,7 @@ func StartCmd(ctx context.Context, name string) *cobra.Command {
 
 			// connect to the KOTS WebSocket server
 			if !disableWebsocket {
-				go func() {
-					go websocket.ConnectToKOTSWebSocket(ctx)
-				}()
+				go websocket.ConnectToKOTSWebSocket(ctx)
 			}
 
 			<-ctx.Done()