Skip to content

Add condition to skip processing for externally managed VMIs #47

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

Add condition to skip processing for externally managed VMIs #47

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
12 changes: 11 additions & 1 deletion pkg/controller/virtualmachineinstance/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ import (
)

const (
vmiControllerName = "harvester-cloudprovider-resync-topology"
vmiControllerName = "harvester-cloudprovider-resync-topology"
externallyManagedNodeLabel = "harvesterhci.io/externally-managed-node"
)

// Register the controller is helping to re-sync harvester node topology labels to guest cluster nodes.
Expand Down Expand Up @@ -75,6 +76,15 @@ func (h *Handler) OnVmiChanged(_ string, vmi *kubevirtv1.VirtualMachineInstance)
return vmi, nil
}

// Skip processing if the external-managed-node label is present
Copy link
Copy Markdown
Member

@w13915984028 w13915984028 Dec 18, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mattmattox Thanks for your committing and sorry for the later review, as no one was assigned to review the PR.

The PR looks good, and I only have this question:

L88 has the check if creator := vmi.Labels[builder.LabelKeyVirtualMachineCreator]; creator != virtualmachine.VirtualMachineCreatorNodeDriver to skip the VM.

If you add external VMIs to the cluster, does the related VMI still happens to have LabelKeyVirtualMachineCreator label? could you utilize this existing label to skip it?

if _, exists := vmi.Labels[externallyManagedNodeLabel]; exists {
logrus.WithFields(logrus.Fields{
"namespace": vmi.Namespace,
"name": vmi.Name,
}).Info("skip processing virtual machine instance due to externally-managed-node label")
return vmi, nil
}

if creator := vmi.Labels[builder.LabelKeyVirtualMachineCreator]; creator != virtualmachine.VirtualMachineCreatorNodeDriver {
logrus.WithFields(logrus.Fields{
"namespace": vmi.Namespace,
Expand Down