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

Author: sgalsaleh

Makefile

@@ -36,7 +36,6 @@ LD_FLAGS = \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.AdminConsoleMigrationsImageOverride=$(ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.AdminConsoleKurlProxyImageOverride=$(ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/embeddedclusteroperator.EmbeddedOperatorImageOverride=$(EMBEDDED_OPERATOR_IMAGE_OVERRIDE)
-DISABLE_FIO_BUILD ?= 0
 
 export PATH := $(shell pwd)/bin:$(PATH)
 
@@ -77,16 +76,6 @@ pkg/goods/bins/local-artifact-mirror: Makefile
 	$(MAKE) -C local-artifact-mirror build GOOS=linux GOARCH=amd64
 	cp local-artifact-mirror/bin/local-artifact-mirror-$(GOOS)-$(GOARCH) pkg/goods/bins/local-artifact-mirror
 
-pkg/goods/bins/fio: PLATFORM = linux/amd64
-pkg/goods/bins/fio: Makefile
-ifneq ($(DISABLE_FIO_BUILD),1)
-	mkdir -p pkg/goods/bins
-	docker build -t fio --build-arg PLATFORM=$(PLATFORM) fio
-	docker rm -f fio && docker run --name fio fio
-	docker cp fio:/output/fio pkg/goods/bins/fio
-	touch pkg/goods/bins/fio
-endif
-
 pkg/goods/internal/bins/kubectl-kots: Makefile
 	mkdir -p pkg/goods/internal/bins
 	mkdir -p output/tmp/kots
@@ -121,7 +110,6 @@ static: pkg/goods/bins/k0s \
 	pkg/goods/bins/kubectl-preflight \
 	pkg/goods/bins/kubectl-support_bundle \
 	pkg/goods/bins/local-artifact-mirror \
-	pkg/goods/bins/fio \
 	pkg/goods/internal/bins/kubectl-kots
 
 .PHONY: embedded-cluster-linux-amd64

cmd/embedded-cluster/install.go

@@ -119,14 +119,11 @@ func runHostPreflights(c *cli.Context, hpf *v1beta2.HostPreflightSpec, proxy *ec
 		return nil
 	}
 	pb.Infof("Running host preflights")
-	output, stderr, err := preflights.Run(c.Context, hpf, proxy)
+	output, err := preflights.Run(c.Context, hpf, proxy)
 	if err != nil {
 		pb.CloseWithError()
 		return fmt.Errorf("host preflights failed to run: %w", err)
 	}
-	if stderr != "" {
-		logrus.Debugf("preflight stderr: %s", stderr)
-	}
 
 	err = output.SaveToDisk()
 	if err != nil {

cmd/embedded-cluster/uninstall.go renamed to cmd/embedded-cluster/reset.go

@@ -453,70 +453,52 @@ var resetCommand = &cli.Command{
 			logrus.Infof("Node has been reset. Please reboot to ensure transient configuration is also reset.")
 		}
 
-		if _, err := os.Stat(defaults.PathToK0sConfig()); err == nil {
-			if err := os.Remove(defaults.PathToK0sConfig()); err != nil {
-				return err
-			}
+		if err := helpers.RemoveAll(defaults.PathToK0sConfig()); err != nil {
+			return fmt.Errorf("failed to remove k0s config: %w", err)
 		}
 
 		lamPath := "/etc/systemd/system/local-artifact-mirror.service"
 		if _, err := os.Stat(lamPath); err == nil {
 			if _, err := helpers.RunCommand("systemctl", "stop", "local-artifact-mirror"); err != nil {
 				return err
 			}
-			if err := os.RemoveAll(lamPath); err != nil {
-				return err
-			}
+		}
+		if err := helpers.RemoveAll(lamPath); err != nil {
+			return fmt.Errorf("failed to remove local-artifact-mirror path: %w", err)
 		}
 
 		proxyControllerPath := "/etc/systemd/system/k0scontroller.service.d"
-		if _, err := os.Stat(proxyControllerPath); err == nil {
-			if err := os.RemoveAll(proxyControllerPath); err != nil {
-				return err
-			}
+		if err := helpers.RemoveAll(proxyControllerPath); err != nil {
+			return fmt.Errorf("failed to remove proxy controller path: %w", err)
 		}
 
 		proxyWorkerPath := "/etc/systemd/system/k0sworker.service.d"
-		if _, err := os.Stat(proxyWorkerPath); err == nil {
-			if err := os.RemoveAll(proxyWorkerPath); err != nil {
-				return err
-			}
+		if err := helpers.RemoveAll(proxyWorkerPath); err != nil {
+			return fmt.Errorf("failed to remove proxy worker path: %w", err)
 		}
 
-		if _, err := os.Stat(defaults.EmbeddedClusterHomeDirectory()); err == nil {
-			if err := os.RemoveAll(defaults.EmbeddedClusterHomeDirectory()); err != nil {
-				return fmt.Errorf("failed to remove embedded cluster home directory: %w", err)
-			}
+		if err := helpers.RemoveAll(defaults.EmbeddedClusterHomeDirectory()); err != nil {
+			return fmt.Errorf("failed to remove embedded cluster directory: %w", err)
 		}
 
-		if _, err := os.Stat(defaults.PathToK0sContainerdConfig()); err == nil {
-			if err := os.RemoveAll(defaults.PathToK0sContainerdConfig()); err != nil {
-				return fmt.Errorf("failed to remove containerd config: %w", err)
-			}
+		if err := helpers.RemoveAll(defaults.PathToK0sContainerdConfig()); err != nil {
+			return fmt.Errorf("failed to remove containerd config: %w", err)
 		}
 
-		if _, err := os.Lstat(systemdUnitFileName()); err == nil {
-			if err := os.Remove(systemdUnitFileName()); err != nil {
-				return fmt.Errorf("failed to remove systemd unit file: %w", err)
-			}
+		if err := helpers.RemoveAll(systemdUnitFileName()); err != nil {
+			return fmt.Errorf("failed to remove systemd unit file: %w", err)
 		}
 
-		if _, err := os.Stat("/var/openebs"); err == nil {
-			if err := os.RemoveAll("/var/openebs"); err != nil {
-				return fmt.Errorf("failed to remove openebs storage: %w", err)
-			}
+		if err := helpers.RemoveAll("/var/openebs"); err != nil {
+			return fmt.Errorf("failed to remove openebs storage: %w", err)
 		}
 
-		if _, err := os.Stat("/etc/NetworkManager/conf.d/embedded-cluster.conf"); err == nil {
-			if err := os.RemoveAll("/etc/NetworkManager/conf.d/embedded-cluster.conf"); err != nil {
-				return fmt.Errorf("failed to remove NetworkManager configuration: %w", err)
-			}
+		if err := helpers.RemoveAll("/etc/NetworkManager/conf.d/embedded-cluster.conf"); err != nil {
+			return fmt.Errorf("failed to remove NetworkManager configuration: %w", err)
 		}
 
-		if _, err := os.Stat("/usr/local/bin/k0s"); err == nil {
-			if err := os.RemoveAll("/usr/local/bin/k0s"); err != nil {
-				return fmt.Errorf("failed to remove k0s binary: %w", err)
-			}
+		if err := helpers.RemoveAll("/usr/local/bin/k0s"); err != nil {
+			return fmt.Errorf("failed to remove k0s binary: %w", err)
 		}
 
 		if c.Bool("reboot") {

e2e/materialize_test.go

@@ -21,12 +21,10 @@ func TestMaterialize(t *testing.T) {
 		{"rm", "-rf", "/var/lib/embedded-cluster/bin/kubectl"},
 		{"rm", "-rf", "/var/lib/embedded-cluster/bin/kubectl-preflight"},
 		{"rm", "-rf", "/var/lib/embedded-cluster/bin/kubectl-support_bundle"},
-		{"rm", "-rf", "/var/lib/embedded-cluster/bin/fio"},
 		{"embedded-cluster", "materialize"},
 		{"ls", "-la", "/var/lib/embedded-cluster/bin/kubectl"},
 		{"ls", "-la", "/var/lib/embedded-cluster/bin/kubectl-preflight"},
 		{"ls", "-la", "/var/lib/embedded-cluster/bin/kubectl-support_bundle"},
-		{"ls", "-la", "/var/lib/embedded-cluster/bin/fio"},
 	}
 	if err := RunCommandsOnNode(t, tc, 0, commands); err != nil {
 		t.Fatalf("fail testing materialize assets: %v", err)

fio/Dockerfile

@@ -13,7 +13,7 @@ images:
         tag: 1.31.0-r0@sha256:6823e987c947163eb206670ae879d49ea1603617738ab210b5a9121c811288f4
     openebs-linux-utils:
         repo: proxy.replicated.com/anonymous/replicated/ec-openebs-linux-utils
-        tag: 4.1.0@sha256:5b5e27025a73782fc5c24c3d69feb6b65b4857eba503b2b2216ac4c52d259b9c
+        tag: 4.1.0@sha256:8bcf5645c708b2167d4ec2f74eb29f0afe27eae7e2cc229f0046097e8aa02272
     openebs-provisioner-localpv:
         repo: proxy.replicated.com/anonymous/replicated/ec-openebs-provisioner-localpv
         tag: 4.1.0-r0@sha256:77f54b4935376a4fe460853eb1eb3582ec1301f94ff61929444ddae2e8473972

pkg/addons/openebs/static/metadata.yaml

@@ -27,7 +27,7 @@ localpv-provisioner:
     image:
       registry: proxy.replicated.com/anonymous/
       repository: 'replicated/ec-openebs-linux-utils'
-      tag: '4.1.0@sha256:5b5e27025a73782fc5c24c3d69feb6b65b4857eba503b2b2216ac4c52d259b9c'
+      tag: '4.1.0@sha256:8bcf5645c708b2167d4ec2f74eb29f0afe27eae7e2cc229f0046097e8aa02272'
   hostpathClass:
     enabled: true
     isDefaultClass: true

pkg/addons/openebs/static/values.yaml

@@ -3,11 +3,6 @@
 // these should not happen in the first place.
 package defaults
 
-var (
-	// DefaultProvider holds the default provider and is used by the exported functions.
-	DefaultProvider = NewProvider("")
-)
-
 var (
 	// provider holds a global reference to the default provider.
 	provider *Provider
@@ -16,88 +11,97 @@ var (
 // Holds the default no proxy values.
 var DefaultNoProxy = []string{"localhost", "127.0.0.1", ".default", ".local", ".svc", "kubernetes", "kotsadm-rqlite"}
 
-const ProxyRegistryAddress = "proxy.replicated.com"
+var ProxyRegistryAddress = "proxy.replicated.com"
 
 const KotsadmNamespace = "kotsadm"
 const SeaweedFSNamespace = "seaweedfs"
 const RegistryNamespace = "registry"
 const VeleroNamespace = "velero"
 
+// def returns a global reference to the default provider. creates one if not
+// already created.
+func def() *Provider {
+	if provider == nil {
+		provider = NewProvider("")
+	}
+	return provider
+}
+
 // BinaryName calls BinaryName on the default provider.
 func BinaryName() string {
-	return DefaultProvider.BinaryName()
+	return def().BinaryName()
 }
 
 // EmbeddedClusterBinsSubDir calls EmbeddedClusterBinsSubDir on the default provider.
 func EmbeddedClusterBinsSubDir() string {
-	return DefaultProvider.EmbeddedClusterBinsSubDir()
+	return def().EmbeddedClusterBinsSubDir()
 }
 
 // EmbeddedClusterChartsSubDir calls EmbeddedClusterChartsSubDir on the default provider.
 func EmbeddedClusterChartsSubDir() string {
-	return DefaultProvider.EmbeddedClusterChartsSubDir()
+	return def().EmbeddedClusterChartsSubDir()
 }
 
 // EmbeddedClusterImagesSubDir calls EmbeddedClusterImagesSubDir on the default provider.
 func EmbeddedClusterImagesSubDir() string {
-	return DefaultProvider.EmbeddedClusterImagesSubDir()
+	return def().EmbeddedClusterImagesSubDir()
 }
 
 // EmbeddedClusterLogsSubDir calls EmbeddedClusterLogsSubDir on the default provider.
 func EmbeddedClusterLogsSubDir() string {
-	return DefaultProvider.EmbeddedClusterLogsSubDir()
+	return def().EmbeddedClusterLogsSubDir()
 }
 
 // K0sBinaryPath calls K0sBinaryPath on the default provider.
 func K0sBinaryPath() string {
-	return DefaultProvider.K0sBinaryPath()
+	return def().K0sBinaryPath()
 }
 
 // PathToEmbeddedClusterBinary calls PathToEmbeddedClusterBinary on the default provider.
 func PathToEmbeddedClusterBinary(name string) string {
-	return DefaultProvider.PathToEmbeddedClusterBinary(name)
+	return def().PathToEmbeddedClusterBinary(name)
 }
 
 // PathToLog calls PathToLog on the default provider.
 func PathToLog(name string) string {
-	return DefaultProvider.PathToLog(name)
+	return def().PathToLog(name)
 }
 
 // PathToKubeConfig calls PathToKubeConfig on the default provider.
 func PathToKubeConfig() string {
-	return DefaultProvider.PathToKubeConfig()
+	return def().PathToKubeConfig()
 }
 
 // PreferredNodeIPAddress calls PreferredNodeIPAddress on the default provider.
 func PreferredNodeIPAddress() (string, error) {
-	return DefaultProvider.PreferredNodeIPAddress()
+	return def().PreferredNodeIPAddress()
 }
 
 // TryDiscoverPublicIP calls TryDiscoverPublicIP on the default provider.
 func TryDiscoverPublicIP() string {
-	return DefaultProvider.TryDiscoverPublicIP()
+	return def().TryDiscoverPublicIP()
 }
 
 // PathToK0sConfig calls PathToK0sConfig on the default provider.
 func PathToK0sConfig() string {
-	return DefaultProvider.PathToK0sConfig()
+	return def().PathToK0sConfig()
 }
 
 // PathToK0sStatusSocket calls PathToK0sStatusSocket on the default provider.
 func PathToK0sStatusSocket() string {
-	return DefaultProvider.PathToK0sStatusSocket()
+	return def().PathToK0sStatusSocket()
 }
 
 func PathToK0sContainerdConfig() string {
-	return DefaultProvider.PathToK0sContainerdConfig()
+	return def().PathToK0sContainerdConfig()
 }
 
 // EmbeddedClusterHomeDirectory calls EmbeddedClusterHomeDirectory on the default provider.
 func EmbeddedClusterHomeDirectory() string {
-	return DefaultProvider.EmbeddedClusterHomeDirectory()
+	return def().EmbeddedClusterHomeDirectory()
 }
 
 // PathToEmbeddedClusterSupportFile calls PathToEmbeddedClusterSupportFile on the default provider.
 func PathToEmbeddedClusterSupportFile(name string) string {
-	return DefaultProvider.PathToEmbeddedClusterSupportFile(name)
+	return def().PathToEmbeddedClusterSupportFile(name)
 }