YuzuZensai/netbird-kubernetes-operator
1
0
Fork 0
mirror of https://github.com/YuzuZensai/netbird-kubernetes-operator.git synced 2026-09-13 10:49:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Force ownership on apply to resolve conflicts with manual edits (#309)

Browse Source 
If not set the apply will error if a resource has been manually edited.
This changes all apply calls to use force ownership.

<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->

## Summary by CodeRabbit

## Release Notes

* **Bug Fixes**
* Fixed resource ownership handling across multiple controllers to
ensure proper claim and management of Kubernetes resources during
deployment and reconciliation operations.

<!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
Philip Laine
2026-06-15 21:25:55 +02:00
committed by GitHub
parent 07212d1f72
commit 305bc9ca34
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/networkrouter_controller.go
+4 -4
View File
@@ -114,7 +114,7 @@ func (r *NetworkRouterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
nbv1alpha1ac.GroupSpec().
WithName(fmt.Sprintf("networkrouter-%s", uniqueSuffix)),
)
err = r.Client.Apply(ctx, groupAC)
err = r.Client.Apply(ctx, groupAC, client.ForceOwnership)
if err != nil {
return ctrl.Result{}, err
}
@@ -141,7 +141,7 @@ func (r *NetworkRouterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
WithEphemeral(true).
WithAutoGroups(nbv1alpha1ac.GroupReference().WithID(group.Status.GroupID)),
)
err = r.Client.Apply(ctx, setupKeyAC)
err = r.Client.Apply(ctx, setupKeyAC, client.ForceOwnership)
if err != nil {
return ctrl.Result{}, err
}
@@ -338,7 +338,7 @@ func (r *NetworkRouterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
WithLabels(workloadLabels).
WithAnnotations(workloadAnnotations).
WithSpec(appsv1ac.DeploymentSpec().WithReplicas(replicas).WithSelector(metav1ac.LabelSelector().WithMatchLabels(selectorLabels)).WithTemplate(podTemplateSpecAC))
err = r.Client.Apply(ctx, depAC)
err = r.Client.Apply(ctx, depAC, client.ForceOwnership)
if err != nil {
return ctrl.Result{}, err
}
@@ -354,7 +354,7 @@ func (r *NetworkRouterReconciler) Reconcile(ctx context.Context, req ctrl.Reques
WithMatchLabels(selectorLabels),
),
)
err = r.Client.Apply(ctx, pdbAC)
err = r.Client.Apply(ctx, pdbAC, client.ForceOwnership)
if err != nil {
return ctrl.Result{}, err
}