Skip to content

Commit 8c7879e

Browse files
committed
Merge remote-tracking branch 'origin/main' into k0s-1-28-7
2 parents 6494bd4 + 4f9e536 commit 8c7879e

File tree

3 files changed

+1
-6
lines changed

3 files changed

+1
-6
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ARCH := $(shell uname -m)
44
APP_NAME = embedded-cluster
55
ADMIN_CONSOLE_CHART_URL = oci://registry.replicated.com/library
66
ADMIN_CONSOLE_CHART_NAME = admin-console
7-
ADMIN_CONSOLE_CHART_VERSION = 1.107.6
7+
ADMIN_CONSOLE_CHART_VERSION = 1.107.7
88
ADMIN_CONSOLE_IMAGE_OVERRIDE =
99
ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
1010
EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library

cmd/embedded-cluster/join.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -325,10 +325,6 @@ func runK0sInstallCommand(fullcmd string) error {
325325
args = append(args, "--token-file", "/etc/k0s/join-token")
326326
if strings.Contains(fullcmd, "controller") {
327327
args = append(args, "--disable-components", "konnectivity-server", "--enable-dynamic-config")
328-
329-
if !strings.Contains(fullcmd, "--no-taints") {
330-
args = append(args, "--no-taints")
331-
}
332328
}
333329
if _, err := runCommand(args[0], args[1:]...); err != nil {
334330
return err

cmd/embedded-cluster/uninstall.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@ func (h *hostInfo) drainNode() error {
9292
"drain",
9393
"--ignore-daemonsets",
9494
"--delete-emptydir-data",
95-
"--delete-local-data",
9695
"--timeout", "60s",
9796
h.Hostname,
9897
}

0 commit comments

Comments
 (0)