Set kubelet node-ip for dual-role nodes (#205)

kke · web-flow · commit 1084aca9da9a · 2021-09-09T10:33:18.000+03:00
diff --git a/config/cluster/host.go b/config/cluster/host.go
@@ -196,7 +196,7 @@ func (h *Host) K0sInstallCommand() string {
 		flags.AddUnlessExist(fmt.Sprintf(`--config "%s"`, h.K0sConfigPath()))
 	}
 
-	if !h.IsController() && h.PrivateAddress != "" {
+	if strings.HasSuffix(h.Role, "worker") && h.PrivateAddress != "" {
 		// set worker's private address to --node-ip in --extra-kubelet-args
 		var extra Flags
 		if old := flags.GetValue("--kubelet-extra-args"); old != "" {

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ func (h *Host) K0sInstallCommand() string {`
`196`	`196`	flags.AddUnlessExist(fmt.Sprintf(`--config "%s"`, h.K0sConfigPath()))
`197`	`197`	`}`
`198`	`198`
`199`		`- if !h.IsController() && h.PrivateAddress != "" {`
	`199`	`+ if strings.HasSuffix(h.Role, "worker") && h.PrivateAddress != "" {`
`200`	`200`	`// set worker's private address to --node-ip in --extra-kubelet-args`
`201`	`201`	`var extra Flags`
`202`	`202`	`if old := flags.GetValue("--kubelet-extra-args"); old != "" {`