mirror of
https://github.com/YuzuZensai/netbird-kubernetes-operator.git
synced 2026-09-13 10:49:15 +00:00
Force ownership on apply to resolve conflicts with manual edits (#309)
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:
@@ -149,7 +149,7 @@ func (r *SetupKeyReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
|
||||
secret := corev1ac.Secret(setupKey.SecretName(), req.Namespace).
|
||||
WithStringData(data).
|
||||
WithOwnerReferences(owner)
|
||||
err = r.Client.Apply(ctx, secret)
|
||||
err = r.Client.Apply(ctx, secret, client.ForceOwnership)
|
||||
if err != nil {
|
||||
return ctrl.Result{}, err
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user