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

Author: emosbaugh

.github/workflows/ci.yaml

@@ -213,75 +213,6 @@ jobs:
           echo "K0S_VERSION=\"$K0S_VERSION\""
           echo "k0s_version=$K0S_VERSION" >> "$GITHUB_OUTPUT"
 
-  build-legacydr:
-    name: Build legacy DR
-    runs-on: embedded-cluster-2
-    needs:
-      - git-sha
-    outputs:
-      k0s_version: ${{ steps.export.outputs.k0s_version }}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      - name: Cache embedded bins
-        uses: actions/cache@v4
-        with:
-          path: |
-            output/bins
-          key: bins-cache
-
-      - name: Setup go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          cache-dependency-path: "**/*.sum"
-
-      - name: Install dagger
-        run: |
-          curl -fsSL https://dl.dagger.io/dagger/install.sh | sh
-          sudo mv ./bin/dagger /usr/local/bin/dagger
-
-      - name: Build
-        env:
-          APP_CHANNEL_ID: 2cHXb1RCttzpR0xvnNWyaZCgDBP
-          APP_CHANNEL_SLUG: ci
-          RELEASE_YAML_DIR: e2e/kots-release-install-legacydr
-          S3_BUCKET: "tf-staging-embedded-cluster-bin"
-          USES_DEV_BUCKET: "0"
-          AWS_ACCESS_KEY_ID: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.STAGING_EMBEDDED_CLUSTER_UPLOAD_IAM_SECRET }}
-          AWS_REGION: "us-east-1"
-          USE_CHAINGUARD: "1"
-          UPLOAD_BINARIES: "1"
-          SKIP_RELEASE: "1"
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          export K0S_VERSION=$(make print-K0S_VERSION)
-          export EC_VERSION=$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')-legacydr
-          export APP_VERSION=appver-dev-${{ needs.git-sha.outputs.git_sha }}-legacydr
-          # avoid rate limiting
-          export FIO_VERSION=$(gh release list --repo axboe/fio --json tagName,isLatest | jq -r '.[] | select(.isLatest==true)|.tagName' | cut -d- -f2)
-
-          ./scripts/build-and-release.sh
-          cp output/bin/embedded-cluster output/bin/embedded-cluster-legacydr
-
-      - name: Upload release
-        uses: actions/upload-artifact@v4
-        with:
-          name: legacydr-release
-          path: |
-            output/bin/embedded-cluster-legacydr
-
-      - name: Export k0s version
-        id: export
-        run: |
-          K0S_VERSION="$(make print-K0S_VERSION)"
-          echo "K0S_VERSION=\"$K0S_VERSION\""
-          echo "k0s_version=$K0S_VERSION" >> "$GITHUB_OUTPUT"
-
   build-previous-k0s:
     name: Build previous k0s
     runs-on: embedded-cluster-2
@@ -518,7 +449,6 @@ jobs:
     needs:
       - git-sha
       - build-current
-      - build-legacydr
       - build-previous-k0s
       - build-upgrade
       - find-previous-stable
@@ -591,7 +521,7 @@ jobs:
           ./scripts/ci-release-app.sh
 
           # promote a release with improved dr support
-          export EC_VERSION="$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')-legacydr"
+          export EC_VERSION="$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')"
           export APP_VERSION="appver-${SHORT_SHA}-legacydr"
           export RELEASE_YAML_DIR=e2e/kots-release-install-legacydr
           ./scripts/ci-release-app.sh
@@ -636,12 +566,6 @@ jobs:
           export RELEASE_YAML_DIR=e2e/kots-release-install
           ./scripts/ci-release-app.sh
 
-          # promote a release with improved dr support
-          export EC_VERSION="$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')-legacydr"
-          export APP_VERSION="appver-${SHORT_SHA}-legacydr"
-          export RELEASE_YAML_DIR=e2e/kots-release-install-legacydr
-          ./scripts/ci-release-app.sh
-
           # then a noop upgrade
           export EC_VERSION="$(git describe --tags --abbrev=4 --match='[0-9]*.[0-9]*.[0-9]*')"
           export APP_VERSION="appver-${SHORT_SHA}-noop"
@@ -687,7 +611,6 @@ jobs:
     needs:
       - git-sha
       - build-current
-      - build-legacydr
       - build-previous-k0s
       - build-upgrade
       - find-previous-stable
@@ -735,11 +658,6 @@ jobs:
         with:
           name: current-release
           path: output/bin
-      - name: Download new DR binary
-        uses: actions/download-artifact@v4
-        with:
-          name: legacydr-release
-          path: output/bin
       - name: Setup go
         uses: actions/setup-go@v5
         with:
@@ -786,7 +704,6 @@ jobs:
     runs-on: ${{ matrix.runner || 'ubuntu-22.04' }}
     needs:
       - build-current
-      - build-legacydr
       - build-previous-k0s
       - build-upgrade
       - find-previous-stable
@@ -854,7 +771,6 @@ jobs:
     runs-on: ${{ matrix.runner || 'ubuntu-22.04' }}
     needs:
       - build-current
-      - build-legacydr
       - build-previous-k0s
       - build-upgrade
       - find-previous-stable

cmd/installer/cli/install.go

@@ -220,6 +220,7 @@ func preRunInstall(cmd *cobra.Command, flags *InstallCmdFlags) error {
 	flags.isAirgap = flags.airgapBundle != ""
 
 	runtimeconfig.ApplyFlags(cmd.Flags())
+	os.Setenv("KUBECONFIG", runtimeconfig.PathToKubeConfig()) // this is needed for restore as well since it shares this function
 	os.Setenv("TMPDIR", runtimeconfig.EmbeddedClusterTmpSubDir())
 
 	if err := runtimeconfig.WriteToDisk(); err != nil {
@@ -616,9 +617,6 @@ func installAndStartCluster(ctx context.Context, networkInterface string, airgap
 		return nil, fmt.Errorf("wait for node: %w", err)
 	}
 
-	// init the kubeconfig
-	os.Setenv("KUBECONFIG", runtimeconfig.PathToKubeConfig())
-
 	loading.Infof("Node installation finished!")
 	return cfg, nil
 }

cmd/installer/cli/root.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/replicatedhq/embedded-cluster/pkg/dryrun"
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
+	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )
 
@@ -33,7 +34,8 @@ func InitAndExecute(ctx context.Context, name string) {
 	err := cmd.Execute()
 	if err != nil {
 		if !errors.As(err, &ErrorNothingElseToAdd{}) {
-			fmt.Fprintln(os.Stderr, err)
+			// Logrus Fatal level logs to stderr and gets sent to the log file.
+			logrus.Fatal(err)
 		}
 		os.Exit(1)
 	}

e2e/restore_test.go

@@ -127,16 +127,21 @@ func TestSingleNodeLegacyDisasterRecovery(t *testing.T) {
 	}
 
 	tc := docker.NewCluster(&docker.ClusterInput{
-		T:            t,
-		Nodes:        1,
-		Distro:       "debian-bookworm",
-		LicensePath:  "snapshot-license.yaml",
-		ECBinaryPath: "../output/bin/embedded-cluster-legacydr",
+		T:      t,
+		Nodes:  1,
+		Distro: "debian-bookworm",
 	})
 	defer tc.Cleanup()
 
+	appVersion := fmt.Sprintf("appver-%s-legacydr", os.Getenv("SHORT_SHA"))
+	t.Logf("%s: downloading embedded-cluster on node 0", time.Now().Format(time.RFC3339))
+	line := []string{"vandoor-prepare.sh", appVersion, os.Getenv("SNAPSHOT_LICENSE_ID"), "false"}
+	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
+		t.Fatalf("fail to download embedded-cluster on node 0: %v: %s: %s", err, stdout, stderr)
+	}
+
 	t.Logf("%s: installing embedded-cluster on node 0", time.Now().Format(time.RFC3339))
-	line := []string{"single-node-install.sh", "ui", os.Getenv("SHORT_SHA")}
+	line = []string{"single-node-install.sh", "ui", os.Getenv("SHORT_SHA")}
 	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {
 		t.Fatalf("fail to install embedded-cluster on node 0: %v: %s: %s", err, stdout, stderr)
 	}
@@ -148,8 +153,6 @@ func TestSingleNodeLegacyDisasterRecovery(t *testing.T) {
 		t.Fatalf("fail to run playwright test deploy-app: %v", err)
 	}
 
-	appVersion := fmt.Sprintf("appver-%s-legacydr", os.Getenv("SHORT_SHA"))
-
 	t.Logf("%s: checking installation state", time.Now().Format(time.RFC3339))
 	line = []string{"check-installation-state.sh", appVersion, k8sVersion()}
 	if stdout, stderr, err := tc.RunCommandOnNode(0, line); err != nil {

pkg/addons/adminconsole/static/values.tpl.yaml

@@ -7,7 +7,6 @@ images:
 {{- end }}
 isHA: false
 isHelmManaged: false
-isEC2Install: true
 kurlProxy:
     enabled: true
     nodePort: 30000

pkg/addons/highavailability.go

@@ -12,6 +12,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/helm"
 	"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/spinner"
+	"github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
@@ -46,6 +47,8 @@ func EnableHA(ctx context.Context, kcli client.Client, hcli helm.Client, isAirga
 	loading := spinner.Start()
 	defer loading.Close()
 
+	logrus.Debugf("Enabling high availability")
+
 	if isAirgap {
 		loading.Infof("Enabling high availability")
 
@@ -58,30 +61,40 @@ func EnableHA(ctx context.Context, kcli client.Client, hcli helm.Client, isAirga
 			return errors.Wrap(err, "check if seaweedfs release exists")
 		}
 		if !exists {
+			logrus.Debugf("Installing seaweedfs")
 			if err := sw.Install(ctx, kcli, hcli, addOnOverrides(sw, cfgspec, nil), nil); err != nil {
 				return errors.Wrap(err, "install seaweedfs")
 			}
+			logrus.Debugf("Seaweedfs installed!")
+		} else {
+			logrus.Debugf("Seaweedfs already installed")
 		}
 
 		// TODO (@salah): add support for end user overrides
 		reg := &registry.Registry{
 			ServiceCIDR: serviceCIDR,
 			IsHA:        true,
 		}
+		logrus.Debugf("Migrating registry data")
 		if err := reg.Migrate(ctx, kcli, loading); err != nil {
 			return errors.Wrap(err, "migrate registry data")
 		}
+		logrus.Debugf("Registry migration complete!")
+		logrus.Debugf("Upgrading registry")
 		if err := reg.Upgrade(ctx, kcli, hcli, addOnOverrides(reg, cfgspec, nil)); err != nil {
 			return errors.Wrap(err, "upgrade registry")
 		}
+		logrus.Debugf("Registry upgraded!")
 	}
 
 	loading.Infof("Updating the Admin Console for high availability")
 
+	logrus.Debugf("Enabling admin console high availability")
 	err := EnableAdminConsoleHA(ctx, kcli, hcli, isAirgap, serviceCIDR, proxy, cfgspec)
 	if err != nil {
 		return errors.Wrap(err, "enable admin console high availability")
 	}
+	logrus.Debugf("Admin console high availability enabled!")
 
 	in, err := kubeutils.GetLatestInstallation(ctx, kcli)
 	if err != nil {
@@ -94,6 +107,8 @@ func EnableHA(ctx context.Context, kcli client.Client, hcli helm.Client, isAirga
 		return errors.Wrap(err, "update installation")
 	}
 
+	logrus.Debugf("High availability enabled!")
+
 	loading.Infof("High availability enabled!")
 	return nil
 }

pkg/addons/registry/migrate.go

@@ -18,6 +18,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/seaweedfs"
 	"github.com/replicatedhq/embedded-cluster/pkg/spinner"
+	"github.com/sirupsen/logrus"
 	"golang.org/x/sync/errgroup"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -41,9 +42,11 @@ func (r *Registry) Migrate(ctx context.Context, kcli client.Client, progressWrit
 		return errors.Wrap(err, "get s3 client")
 	}
 
+	logrus.Debug("Ensuring registry bucket")
 	if err := ensureRegistryBucket(ctx, s3Client); err != nil {
 		return errors.Wrap(err, "ensure registry bucket")
 	}
+	logrus.Debug("Registry bucket ensured!")
 
 	pipeReader, pipeWriter := io.Pipe()
 	g, ctx := errgroup.WithContext(ctx)
@@ -57,9 +60,11 @@ func (r *Registry) Migrate(ctx context.Context, kcli client.Client, progressWrit
 		return writeRegistryData(ctx, pipeReader, s3manager.NewUploader(s3Client), progressWriter)
 	})
 
+	logrus.Debug("Copying registry data")
 	if err := g.Wait(); err != nil {
 		return err
 	}
+	logrus.Debug("Registry data copied!")
 
 	return nil
 }

pkg/addons/registry/upgrade.go

@@ -19,6 +19,7 @@ const (
 	s3SecretName = "seaweedfs-s3-rw"
 )
 
+// Upgrade upgrades the registry chart to the latest version.
 func (r *Registry) Upgrade(ctx context.Context, kcli client.Client, hcli helm.Client, overrides []string) error {
 	exists, err := hcli.ReleaseExists(ctx, namespace, releaseName)
 	if err != nil {

pkg/dryrun/kubeutils.go

@@ -40,10 +40,6 @@ func (k *KubeUtils) WaitForInstallation(ctx context.Context, cli client.Client,
 	return nil
 }
 
-func (k *KubeUtils) WaitForHAInstallation(ctx context.Context, cli client.Client) error {
-	return nil
-}
-
 func (k *KubeUtils) WaitForNodes(ctx context.Context, cli client.Client) error {
 	return nil
 }

pkg/helm/client.go

@@ -545,6 +545,10 @@ func cleanUpMapValue(v interface{}) interface{} {
 	switch v := v.(type) {
 	case []interface{}:
 		return cleanUpInterfaceArray(v)
+	case []map[string]interface{}:
+		return cleanUpGenericMapArray(v)
+	case []map[interface{}]interface{}:
+		return cleanUpInterfaceMapArray(v)
 	case map[string]interface{}:
 		return cleanUpGenericMap(v)
 	case map[interface{}]interface{}:
@@ -571,6 +575,24 @@ func cleanUpInterfaceArray(in []interface{}) []interface{} {
 	return result
 }
 
+// Cleans up a slice of map to interface into slice of actual values
+func cleanUpGenericMapArray(in []map[string]interface{}) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(in))
+	for i, v := range in {
+		result[i] = cleanUpGenericMap(v)
+	}
+	return result
+}
+
+// Cleans up a slice of map to interface into slice of actual values
+func cleanUpInterfaceMapArray(in []map[interface{}]interface{}) []map[string]interface{} {
+	result := make([]map[string]interface{}, len(in))
+	for i, v := range in {
+		result[i] = cleanUpInterfaceMap(v)
+	}
+	return result
+}
+
 // Cleans up the map keys to be strings
 func cleanUpInterfaceMap(in map[interface{}]interface{}) map[string]interface{} {
 	result := make(map[string]interface{})