Skip to content

Fix cluster join: k3s 1.34.0+k3s1 does not set master label. #5521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eriknordmark merged 1 commit into from
Jan 6, 2026
Merged

Fix cluster join: k3s 1.34.0+k3s1 does not set master label. #5521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions pkg/pillar/cmd/zedkube/clusterstatus.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,22 +320,26 @@ func (z *zedkube) clusterStatusHTTPHandler(w http.ResponseWriter, r *http.Reques
return
}

var isMaster, useEtcd bool
var isControlPlane, isMaster, useEtcd bool
labels := node.GetLabels()
if _, ok := labels["node-role.kubernetes.io/master"]; ok {
isMaster = true
}
// Master label removed: https://github.com/k3s-io/k3s/pull/12395
if controlPlaneVal, ok := labels["node-role.kubernetes.io/control-plane"]; ok {
isControlPlane = (controlPlaneVal == "true")
}
if _, ok := labels["node-role.kubernetes.io/etcd"]; ok {
useEtcd = true
}

if isMaster && useEtcd {
if (isControlPlane || isMaster) && useEtcd {
// Return cluster status with cluster UUID: cluster:<cluster-uuid>
clusterUUID := z.clusterConfig.ClusterID.UUID.String()
fmt.Fprintf(w, "cluster:%s", clusterUUID)
return
}
log.Functionf("clusterStatusHTTPHandler: not master or etcd")
log.Functionf("clusterStatusHTTPHandler: not control-plane and etcd")
fmt.Fprint(w, "")
}

Expand Down
Loading