Skip to content

fix(yurtmanager): prevent nil map assignment panic in hubleader controller #2720

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

Open
nishantbkl3345-ship-it wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(yurtmanager): prevent nil map assignment panic in hubleader controller #2720

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
558e82f
fix(yurtmanager): prevent nil map panic in hubleader controller when …
Aug 2, 2026
d327ea7
Potential fix for pull request finding
nishantbkl3345-ship-it Aug 15, 2026
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
6 changes: 4 additions & 2 deletions pkg/yurtmanager/controller/hubleader/hubleader_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,10 @@ func (r *ReconcileHubLeader) reconcileHubLeader(ctx context.Context, nodepool *a
// Set match labels
matchLabels := make(map[string]string)
if nodepool.Spec.LeaderElectionStrategy == string(appsv1beta2.ElectionStrategyMark) {
// Add mark strategy match labels
matchLabels = nodepool.Spec.LeaderNodeLabelSelector
// Add mark strategy match labels safely without overwriting matchLabels with a potential nil map
for k, v := range nodepool.Spec.LeaderNodeLabelSelector {
matchLabels[k] = v
}
Comment thread
nishantbkl3345-ship-it marked this conversation as resolved.
Outdated
}
matchLabels[projectinfo.GetNodePoolLabel()] = nodepool.GetName()

Expand Down
42 changes: 42 additions & 0 deletions pkg/yurtmanager/controller/hubleader/hubleader_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,48 @@ func TestReconcile(t *testing.T) {
},
expectErr: false,
},
"mark election strategy with nil LeaderNodeLabelSelector": {
pool: &appsv1beta2.NodePool{
ObjectMeta: metav1.ObjectMeta{
Name: "hangzhou",
},
Spec: appsv1beta2.NodePoolSpec{
Type: appsv1beta2.Edge,
Labels: map[string]string{
"region": "hangzhou",
},
LeaderElectionStrategy: string(appsv1beta2.ElectionStrategyMark),
LeaderNodeLabelSelector: nil,
LeaderReplicas: 1,
EnableLeaderElection: true,
},
},
expectedNodePool: &appsv1beta2.NodePool{
ObjectMeta: metav1.ObjectMeta{
Name: "hangzhou",
},
Spec: appsv1beta2.NodePoolSpec{
Type: appsv1beta2.Edge,
Labels: map[string]string{
"region": "hangzhou",
},
LeaderElectionStrategy: string(appsv1beta2.ElectionStrategyMark),
LeaderNodeLabelSelector: nil,
EnableLeaderElection: true,
LeaderReplicas: 1,
},
Status: appsv1beta2.NodePoolStatus{
LeaderEndpoints: []appsv1beta2.Leader{
{
NodeName: "ready with internal IP",
Address: "10.0.0.1",
},
},
LeaderNum: 1,
},
},
expectErr: false,
},
"no potential leaders in hangzhou with mark strategy": {
pool: &appsv1beta2.NodePool{
ObjectMeta: metav1.ObjectMeta{
Expand Down