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

Author: laverya

.github/workflows/ci.yaml

@@ -42,6 +42,7 @@ jobs:
         uses: golangci/golangci-lint-action@v6
         with:
           version: v1.60.3
+          args: --build-tags exclude_graphdriver_btrfs
 
   test:
     name: Unit tests
@@ -519,6 +520,7 @@ jobs:
           - TestMultiNodeReset
           - TestCollectSupportBundle
           - TestUnsupportedOverrides
+          - TestHostCollectSupportBundleInCluster
     steps:
       - name: Checkout
         uses: actions/checkout@v4

.gitignore

@@ -16,3 +16,4 @@ go.work.sum
 .gomodcache
 /local-dev/
 *.tmp
+.envrc

Makefile

@@ -234,12 +234,12 @@ embedded-cluster:
 unit-tests:
 	mkdir -p pkg/goods/bins pkg/goods/internal/bins
 	touch pkg/goods/bins/BUILD pkg/goods/internal/bins/BUILD # compilation will fail if no files are present
-	go test -v ./pkg/... ./cmd/...
+	go test -tags exclude_graphdriver_btrfs -v ./pkg/... ./cmd/...
 	$(MAKE) -C operator test
 
 .PHONY: vet
 vet: static
-	go vet ./...
+	go vet -tags exclude_graphdriver_btrfs ./...
 
 .PHONY: e2e-tests
 e2e-tests: embedded-release
@@ -266,11 +266,11 @@ clean:
 
 .PHONY: lint
 lint:
-	golangci-lint run -c .golangci.yml ./...
+	golangci-lint run -c .golangci.yml ./... --build-tags exclude_graphdriver_btrfs
 
 .PHONY: lint-and-fix
 lint-and-fix:
-	golangci-lint run --fix -c .golangci.yml ./...
+	golangci-lint run --fix -c .golangci.yml ./... --build-tags exclude_graphdriver_btrfs
 
 .PHONY: scan
 scan:
@@ -285,7 +285,7 @@ scan:
 buildtools:
 	mkdir -p pkg/goods/bins pkg/goods/internal/bins
 	touch pkg/goods/bins/BUILD pkg/goods/internal/bins/BUILD # compilation will fail if no files are present
-	go build -o ./output/bin/buildtools ./cmd/buildtools
+	go build -tags exclude_graphdriver_btrfs -o ./output/bin/buildtools ./cmd/buildtools
 
 .PHONY: list-distros
 list-distros:

cmd/embedded-cluster/flags.go

@@ -74,19 +74,3 @@ func getDataDirFlagWithDefault(runtimeConfig *ecv1beta1.RuntimeConfigSpec) *cli.
 		},
 	}
 }
-
-func getDataDirFlag(runtimeConfig *ecv1beta1.RuntimeConfigSpec) *cli.StringFlag {
-	return &cli.StringFlag{
-		Name:   "data-dir",
-		Usage:  "Path to the data directory (default discovered from the cluster)",
-		Hidden: false,
-		Action: func(c *cli.Context, s string) error {
-			if s == "" {
-				return nil
-			}
-			logrus.Debugf("Setting data dir to %s from flag", s)
-			runtimeConfig.DataDir = s
-			return nil
-		},
-	}
-}

cmd/embedded-cluster/install.go

@@ -18,6 +18,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/addons"
 	"github.com/replicatedhq/embedded-cluster/pkg/airgap"
 	"github.com/replicatedhq/embedded-cluster/pkg/config"
+	"github.com/replicatedhq/embedded-cluster/pkg/configutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/defaults"
 	"github.com/replicatedhq/embedded-cluster/pkg/goods"
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
@@ -707,6 +708,11 @@ func installCommand() *cli.Command {
 			defer tryRemoveTmpDirContents(provider)
 
 			var err error
+			err = configutils.WriteRuntimeConfig(runtimeConfig)
+			if err != nil {
+				return fmt.Errorf("unable to write runtime config: %w", err)
+			}
+
 			proxy, err := getProxySpecFromFlags(c)
 			if err != nil {
 				return fmt.Errorf("unable to get proxy spec from flags: %w", err)

cmd/embedded-cluster/join.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/replicatedhq/embedded-cluster/pkg/airgap"
 	"github.com/replicatedhq/embedded-cluster/pkg/config"
+	"github.com/replicatedhq/embedded-cluster/pkg/configutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/defaults"
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
 	"github.com/replicatedhq/embedded-cluster/pkg/highavailability"
@@ -190,6 +191,11 @@ var joinCommand = &cli.Command{
 			return fmt.Errorf("unable to get join token: %w", err)
 		}
 
+		err = configutils.WriteRuntimeConfig(jcmd.InstallationSpec.RuntimeConfig)
+		if err != nil {
+			return fmt.Errorf("unable to write runtime config: %w", err)
+		}
+
 		provider := defaults.NewProviderFromRuntimeConfig(jcmd.InstallationSpec.RuntimeConfig)
 		os.Setenv("KUBECONFIG", provider.PathToKubeConfig())
 		os.Setenv("TMPDIR", provider.EmbeddedClusterTmpSubDir())

cmd/embedded-cluster/main.go

@@ -38,6 +38,7 @@ func main() {
 			updateCommand(),
 			restoreCommand(),
 			adminConsoleCommand(),
+			supportBundleCommand(),
 		},
 	}
 	if err := app.RunContext(ctx, os.Args); err != nil {

cmd/embedded-cluster/provider.go

@@ -6,6 +6,7 @@ import (
 	"os"
 
 	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
+	"github.com/replicatedhq/embedded-cluster/pkg/configutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/defaults"
 	"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
 )
@@ -36,14 +37,21 @@ func discoverKubeconfigPath(ctx context.Context, runtimeConfig *ecv1beta1.Runtim
 }
 
 // discoverBestProvider discovers the provider from the cluster (if it's up) and will fall back to
-// the filesystem, or the default.
+// the /etc/embedded-cluster/ec.yaml file, the filesystem, or the default.
 func discoverBestProvider(ctx context.Context) *defaults.Provider {
 	// It's possible that the cluster is not up
 	provider, err := getProviderFromCluster(ctx)
 	if err == nil {
 		return provider
 	}
 
+	// There might be a runtime config file
+	runtimeConfig, err := configutils.ReadRuntimeConfig()
+	if err == nil {
+		provider = defaults.NewProviderFromRuntimeConfig(runtimeConfig)
+		return provider
+	}
+
 	// Otherwise, fall back to the filesystem
 	provider, err = defaults.NewProviderFromFilesystem()
 	if err == nil {

cmd/embedded-cluster/reset.go

@@ -18,7 +18,6 @@ import (
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	ecv1beta1 "github.com/replicatedhq/embedded-cluster/kinds/apis/v1beta1"
 	"github.com/replicatedhq/embedded-cluster/pkg/defaults"
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
 	"github.com/replicatedhq/embedded-cluster/pkg/kubeutils"
@@ -330,8 +329,6 @@ func maybePrintHAWarning(ctx context.Context, provider *defaults.Provider) error
 }
 
 func resetCommand() *cli.Command {
-	runtimeConfig := ecv1beta1.GetDefaultRuntimeConfig()
-
 	return &cli.Command{
 		Name: "reset",
 		Before: func(c *cli.Context) error {
@@ -342,7 +339,6 @@ func resetCommand() *cli.Command {
 		},
 		Args: false,
 		Flags: []cli.Flag{
-			getDataDirFlag(runtimeConfig),
 			&cli.BoolFlag{
 				Name:    "force",
 				Aliases: []string{"f"},
@@ -357,12 +353,7 @@ func resetCommand() *cli.Command {
 		},
 		Usage: fmt.Sprintf("Remove %s from the current node", binName),
 		Action: func(c *cli.Context) error {
-			var provider *defaults.Provider
-			if c.IsSet("data-dir") {
-				provider = defaults.NewProviderFromRuntimeConfig(runtimeConfig)
-			} else {
-				provider = discoverBestProvider(c.Context)
-			}
+			provider := discoverBestProvider(c.Context)
 			os.Setenv("KUBECONFIG", provider.PathToKubeConfig())
 			os.Setenv("TMPDIR", provider.EmbeddedClusterTmpSubDir())
 
@@ -502,6 +493,10 @@ func resetCommand() *cli.Command {
 				return fmt.Errorf("failed to remove k0s binary: %w", err)
 			}
 
+			if err := helpers.RemoveAll(defaults.PathToECConfig()); err != nil {
+				return fmt.Errorf("failed to remove embedded cluster data config: %w", err)
+			}
+
 			if _, err := exec.Command("reboot").Output(); err != nil {
 				return err
 			}

cmd/embedded-cluster/restore.go

@@ -22,6 +22,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/addons/seaweedfs"
 	"github.com/replicatedhq/embedded-cluster/pkg/airgap"
 	"github.com/replicatedhq/embedded-cluster/pkg/config"
+	"github.com/replicatedhq/embedded-cluster/pkg/configutils"
 	"github.com/replicatedhq/embedded-cluster/pkg/constants"
 	"github.com/replicatedhq/embedded-cluster/pkg/defaults"
 	"github.com/replicatedhq/embedded-cluster/pkg/helpers"
@@ -958,6 +959,11 @@ func restoreCommand() *cli.Command {
 
 			defer tryRemoveTmpDirContents(provider)
 
+			err := configutils.WriteRuntimeConfig(runtimeConfig)
+			if err != nil {
+				return fmt.Errorf("unable to write runtime config: %w", err)
+			}
+
 			proxy, err := getProxySpecFromFlags(c)
 			if err != nil {
 				return fmt.Errorf("unable to get proxy spec from flags: %w", err)