Skip to content

fix: vcluster will not delete unmanaged nodes for fake nodes (#1944) #3096

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: vcluster will not delete unmanaged nodes for fake nodes (#1944) #3096

Show file tree
Hide file tree
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
7 changes: 7 additions & 0 deletions pkg/controllers/resources/nodes/fake_syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ func (r *fakeNodeSyncer) FakeSync(ctx *synccontext.SyncContext, vObj client.Obje
return ctrl.Result{}, fmt.Errorf("%#v is not a node", vObj)
}

if node.GetLabels() == nil || (node.GetLabels() != nil && node.GetLabels()[translate.MarkerLabel] != translate.VClusterName) {
// This node is not managed by vcluster, doing nothing to it.
ctx.Log.Infof("Unmanaged fake node %s, doing nothing.", vObj.GetName())
return ctrl.Result{}, nil
}

needed, err := r.nodeNeeded(ctx, node.Name)
if err != nil {
return ctrl.Result{}, err
Expand Down Expand Up @@ -164,6 +170,7 @@ func createFakeNode(
"kubernetes.io/arch": runtime.GOARCH,
"kubernetes.io/hostname": translate.SafeConcatName("fake", name),
"kubernetes.io/os": "linux",
translate.MarkerLabel: translate.VClusterName,
},
Annotations: map[string]string{
"node.alpha.kubernetes.io/ttl": "0",
Expand Down
1 change: 1 addition & 0 deletions pkg/controllers/resources/nodes/syncer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ func registerIndices(ctx *synccontext.RegisterContext) error {
func (s *nodeSyncer) SyncToHost(ctx *synccontext.SyncContext, event *synccontext.SyncToHostEvent[*corev1.Node]) (ctrl.Result, error) {
if event.HostOld == nil {
if event.Virtual.GetLabels() == nil || (event.Virtual.GetLabels() != nil && event.Virtual.GetLabels()[translate.MarkerLabel] != translate.VClusterName) {
ctx.Log.Infof("Unmanaged virtual node %s, doing nothing.", event.Virtual.Name)
return ctrl.Result{}, nil
}
}
Expand Down