Skip to content

machine: use patch.NewHelper instead of client.Update() in takeHardwareOwnership() #511

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

Draft
rpardini wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

machine: use patch.NewHelper instead of client.Update() in takeHardwareOwnership() #511

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
11 changes: 8 additions & 3 deletions controller/machine/hardware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,12 @@ func (scope *machineReconcileScope) patchHardwareAnnotations(hw *tinkv1.Hardware
}

func (scope *machineReconcileScope) takeHardwareOwnership(hw *tinkv1.Hardware) error {
if len(hw.Labels) == 0 {
patchHelper, err := patch.NewHelper(hw, scope.client)
if err != nil {
return fmt.Errorf("initializing patch helper for selected hardware: %w", err)
}

if hw.Labels == nil {
hw.Labels = map[string]string{}
}

Expand All @@ -106,8 +111,8 @@ func (scope *machineReconcileScope) takeHardwareOwnership(hw *tinkv1.Hardware) e
// Add finalizer to hardware as well to make sure we release it before Machine object is removed.
controllerutil.AddFinalizer(hw, infrastructurev1.MachineFinalizer)

if err := scope.client.Update(scope.ctx, hw); err != nil {
return fmt.Errorf("updating Hardware object: %w", err)
if err := patchHelper.Patch(scope.ctx, hw); err != nil {
return fmt.Errorf("patching Hardware object: %w", err)
}

return nil
Expand Down