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

Add path component to finalizer (#202)

Browse Source 
The Kubernetes client warns about not having a path component in the
finalizer. This change adds a unqiue path component for each reconciler
kind.
This commit is contained in:
Philip Laine
2026-04-23 19:18:06 +02:00
committed by GitHub
parent 9838f0dccc
commit 91036022c0
11 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/tcproute_controller.go
+5 -5
View File
@@ -16,7 +16,7 @@ import (
"github.com/fluxcd/pkg/runtime/patch"
nbv1alpha1 "github.com/netbirdio/kubernetes-operator/api/v1alpha1"
"github.com/netbirdio/kubernetes-operator/internal/gatewayutil"
"github.com/netbirdio/kubernetes-operator/internal/ssautil"
"github.com/netbirdio/kubernetes-operator/internal/k8sutil"
nbv1alpha1ac "github.com/netbirdio/kubernetes-operator/pkg/applyconfigurations/api/v1alpha1"
)
@@ -56,7 +56,7 @@ func (r *TCPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
return ctrl.Result{}, err
}
controllerutil.AddFinalizer(tr, nbv1alpha1.NetbirdFinalizer)
controllerutil.AddFinalizer(tr, k8sutil.Finalizer("tcproute"))
err = sp.Patch(ctx, tr)
if err != nil {
return ctrl.Result{}, err
@@ -77,12 +77,12 @@ func (r *TCPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (c
}
for _, svc := range svcIdx {
controllerRef, err := ssautil.ControllerReference(&svc, r.Scheme())
controllerRef, err := k8sutil.ControllerReference(&svc, r.Scheme())
if err != nil {
return ctrl.Result{}, err
}
controllerRef = controllerRef.WithBlockOwnerDeletion(false)
ownerRef, err := ssautil.OwnerReference(tr, r.Scheme())
ownerRef, err := k8sutil.OwnerReference(tr, r.Scheme())
if err != nil {
return ctrl.Result{}, err
}
@@ -159,7 +159,7 @@ func (r *TCPRouteReconciler) reconcileDelete(ctx context.Context, sp *patch.Seri
}
}
controllerutil.RemoveFinalizer(tr, nbv1alpha1.NetbirdFinalizer)
controllerutil.RemoveFinalizer(tr, k8sutil.Finalizer("tcproute"))
err := sp.Patch(ctx, tr)
if err != nil {
return ctrl.Result{}, err