Skip to content

Use Patch instead of Update #37

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
notandy merged 1 commit into from
Dec 12, 2025
Merged

Use Patch instead of Update #37

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
2 changes: 1 addition & 1 deletion charts/kvm-node-agent/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ controllerManager:
runAsUser: 0
image:
repository: busybox
tag: "1.37"
tag: "1.28"
manager:
args:
- --health-probe-bind-address=:8081
Expand Down
9 changes: 6 additions & 3 deletions internal/controller/hypervisor_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ func (r *HypervisorReconciler) Reconcile(ctx context.Context, req ctrl.Request)
return ctrl.Result{}, client.IgnoreNotFound(err)
}

base := hypervisor.DeepCopy()

// ====================================================================================================
// Systemd
// ====================================================================================================
Expand Down Expand Up @@ -216,12 +218,13 @@ func (r *HypervisorReconciler) Reconcile(ctx context.Context, req ctrl.Request)

// reset retry count
hypervisor.Status.Update.Retry = 3
if err := r.Status().Update(ctx, &hypervisor); err != nil {
if err := r.Status().Patch(ctx, &hypervisor, client.MergeFromWithOptions(base, client.MergeFromWithOptimisticLock{})); err != nil {
log.Error(err, "unable to update hypervisor status spec")
return ctrl.Result{}, err
}
hypervisor.Spec.OperatingSystemVersion = ""
if err := r.Update(ctx, &hypervisor); err != nil {

if err := r.Status().Patch(ctx, &hypervisor, client.MergeFromWithOptions(base, client.MergeFromWithOptimisticLock{})); err != nil {
log.Error(err, "unable to update hypervisor spec")
return ctrl.Result{}, err
}
Expand Down Expand Up @@ -281,7 +284,7 @@ func (r *HypervisorReconciler) Reconcile(ctx context.Context, req ctrl.Request)
}
}

if err := r.Status().Update(ctx, &hypervisor); err != nil {
if err := r.Status().Patch(ctx, &hypervisor, client.MergeFromWithOptions(base, client.MergeFromWithOptimisticLock{})); err != nil {
log.Error(err, "unable to update hypervisor status")
return ctrl.Result{}, err
}
Expand Down
3 changes: 2 additions & 1 deletion internal/controller/secret_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,13 +163,14 @@ func (r *SecretReconciler) setTLSStatusCondition(ctx context.Context, status met
return err
}

base := hv.DeepCopy()
meta.SetStatusCondition(&hv.Status.Conditions, metav1.Condition{
Type: "TLSCertificateInstalled",
Status: status,
Reason: reason,
Message: message,
})

return r.Status().Update(ctx, hv)
return r.Status().Patch(ctx, hv, client.MergeFromWithOptions(base, client.MergeFromWithOptimisticLock{}))
})
}