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

Author: laverya

Makefile

@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
 APP_NAME = embedded-cluster
 ADMIN_CONSOLE_CHART_URL = oci://registry.replicated.com/library
 ADMIN_CONSOLE_CHART_NAME = admin-console
-ADMIN_CONSOLE_CHART_VERSION = 1.107.6
+ADMIN_CONSOLE_CHART_VERSION = 1.107.7
 ADMIN_CONSOLE_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
 EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library

cmd/embedded-cluster/join.go

@@ -325,10 +325,6 @@ func runK0sInstallCommand(fullcmd string) error {
 	args = append(args, "--token-file", "/etc/k0s/join-token")
 	if strings.Contains(fullcmd, "controller") {
 		args = append(args, "--disable-components", "konnectivity-server", "--enable-dynamic-config")
-
-		if !strings.Contains(fullcmd, "--no-taints") {
-			args = append(args, "--no-taints")
-		}
 	}
 	if _, err := runCommand(args[0], args[1:]...); err != nil {
 		return err

cmd/embedded-cluster/uninstall.go

@@ -92,7 +92,6 @@ func (h *hostInfo) drainNode() error {
 		"drain",
 		"--ignore-daemonsets",
 		"--delete-emptydir-data",
-		"--delete-local-data",
 		"--timeout", "60s",
 		h.Hostname,
 	}