Skip to content

Fix label transport to eviction #200

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
fwiesel merged 2 commits into from
Dec 16, 2025
Merged

Fix label transport to eviction #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
114aef1
transportLabels for arbitrary metadata
fwiesel Dec 16, 2025
8baa4ad
HypervisorMaintenance: Fix transport from hypervisor to eviction
fwiesel Dec 16, 2025
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: 5 additions & 5 deletions internal/controller/hypervisor_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ func syncLabelsAndAnnotations(nodeLabels labels.Set, hypervisor *kvmv1.Hyperviso
}

// transport relevant labels
transportLabels(&node.ObjectMeta, hypervisor)
transportLabels(&node.ObjectMeta, &hypervisor.ObjectMeta)
// transport relevant annotations
transportAggregatesAndTraits(&node.ObjectMeta, hypervisor)
}
Expand Down Expand Up @@ -221,12 +221,12 @@ func transportAggregatesAndTraits(node *metav1.ObjectMeta, hypervisor *kvmv1.Hyp
}
}

// transportLabels transports relevant labels from the Node to the Hypervisor spec
func transportLabels(node *metav1.ObjectMeta, hypervisor *kvmv1.Hypervisor) {
// transportLabels transports relevant labels from the source to the destination metadata
func transportLabels(source, destination *metav1.ObjectMeta) {
// transfer labels
for _, transferLabel := range transferLabels {
if label, ok := node.Labels[transferLabel]; ok {
hypervisor.Labels[transferLabel] = label
if label, ok := source.Labels[transferLabel]; ok {
destination.Labels[transferLabel] = label
}
}
}
2 changes: 1 addition & 1 deletion internal/controller/hypervisor_maintenance_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ func (hec *HypervisorMaintenanceController) ensureEviction(ctx context.Context,
}

// This also transports the label-selector, if set
transportLabels(&eviction.ObjectMeta, hypervisor)
transportLabels(&hypervisor.ObjectMeta, &eviction.ObjectMeta)

if err = hec.Create(ctx, eviction); err != nil {
return metav1.ConditionUnknown, fmt.Errorf("failed to create eviction due to %w", err)
Expand Down