Skip to content

Commit d5f7d66

Browse files
authored
Fix hostname-override kubelet parameter passing (#313)
Node may not have privateAddress in k0sctl.yaml but hostname field specified. These fields should be processed independently here.
1 parent 4069658 commit d5f7d66

File tree

1 file changed

+8
-4
lines changed
  • pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster

1 file changed

+8
-4
lines changed

pkg/apis/k0sctl.k0sproject.io/v1beta1/cluster/host.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -241,17 +241,21 @@ func (h *Host) K0sInstallCommand() string {
241241
flags.AddUnlessExist(fmt.Sprintf(`--config "%s"`, h.K0sConfigPath()))
242242
}
243243

244-
if strings.HasSuffix(h.Role, "worker") && h.PrivateAddress != "" {
245-
// set worker's private address to --node-ip in --extra-kubelet-args
244+
if strings.HasSuffix(h.Role, "worker") {
246245
var extra Flags
247246
if old := flags.GetValue("--kubelet-extra-args"); old != "" {
248247
extra = Flags{unQE(old)}
249248
}
250-
extra.AddUnlessExist(fmt.Sprintf("--node-ip=%s", h.PrivateAddress))
249+
// set worker's private address to --node-ip in --extra-kubelet-args
250+
if h.PrivateAddress != "" {
251+
extra.AddUnlessExist(fmt.Sprintf("--node-ip=%s", h.PrivateAddress))
252+
}
251253
if h.HostnameOverride != "" {
252254
extra.AddOrReplace(fmt.Sprintf("--hostname-override=%s", h.HostnameOverride))
253255
}
254-
flags.AddOrReplace(fmt.Sprintf("--kubelet-extra-args=%s", strconv.Quote(extra.Join())))
256+
if extra != nil {
257+
flags.AddOrReplace(fmt.Sprintf("--kubelet-extra-args=%s", strconv.Quote(extra.Join())))
258+
}
255259
}
256260

257261
cmd := h.Configurer.K0sCmdf("install %s %s", role, flags.Join())

0 commit comments

Comments
 (0)