Refactor uninstallation process (#74)

Docs PR: https://github.com/netbirdio/docs/pull/457

Changes:
* Split kubernetes-operator Chart to operator only chart
(kubernetes-operator) and configuration chart (netbird-operator-config)
* Remove delete validation webhooks for non-needed resources
* Allow abandoning Groups when still linked to a resource for over a
minute after deletion
* Fix duplciate Network Resource retrying heavily
* Fix SetupKey creation duplication
* Skip deleting routing peer since deleting network automatically
deletes it anyway

internal/controller/nbgroup_controller.go

@@ -151,7 +151,7 @@ func (r *NBGroupReconciler) handleDelete(ctx context.Context, nbGroup netbirdiov
 		return err
 	}
 
-	if err != nil && strings.Contains(err.Error(), "linked") {
+	if err != nil && strings.Contains(err.Error(), "linked") && !nbGroup.DeletionTimestamp.Add(time.Minute).Before(time.Now()) {
 		logger.Info("group still linked to resources on netbird", "err", err)
 		// Check if group is defined elsewhere in the cluster
 		var groups netbirdiov1.NBGroupList

internal/controller/nbresource_controller.go

@@ -2,11 +2,15 @@ package controller
 
 import (
 	"context"
+	nerrors "errors"
 	"fmt"
 	"slices"
 	"strings"
 	"time"
 
+	corev1 "k8s.io/api/core/v1"
+	"sigs.k8s.io/controller-runtime/pkg/log"
+
 	"k8s.io/apimachinery/pkg/api/errors"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -23,6 +27,10 @@ import (
 	"github.com/netbirdio/netbird/management/server/http/api"
 )
 
+var (
+	errDuplicateResource = fmt.Errorf("duplicate resource")
+)
+
 // NBResourceReconciler reconciles a NBResource object
 type NBResourceReconciler struct {
 	client.Client
@@ -87,6 +95,10 @@ func (r *NBResourceReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	}
 
 	resource, err := r.handleNetBirdResource(ctx, nbResource, groupIDs, logger)
+	if err != nil && nerrors.Is(err, errDuplicateResource) {
+		return ctrl.Result{RequeueAfter: defaultRequeueAfter}, nil
+	}
+
 	if err != nil {
 		nbResource.Status.Conditions = netbirdiov1.NBConditionFalse("internalError", fmt.Sprintf("Error occurred handling NetBird Network Resource: %v", err))
 		return ctrl.Result{}, err
@@ -406,6 +418,12 @@ func (r *NBResourceReconciler) handleNetBirdResource(ctx context.Context, nbReso
 			Name:        nbResource.Spec.Name,
 		})
 
+		if err != nil && strings.Contains(err.Error(), "already exists") {
+			log.Log.Error(errNetBirdAPI, "network resource with the same name already exists", "err", err)
+			nbResource.Status.Conditions = netbirdiov1.NBConditionFalse("DuplicateName", "Resource name already exists")
+			return nil, errDuplicateResource
+		}
+
 		if err != nil {
 			logger.Error(errNetBirdAPI, "error creating resource", "err", err)
 			return nil, err
@@ -562,6 +580,22 @@ func (r *NBResourceReconciler) handleGroups(ctx context.Context, req ctrl.Reques
 }
 
 func (r *NBResourceReconciler) handleDelete(ctx context.Context, req ctrl.Request, nbResource *netbirdiov1.NBResource, logger logr.Logger) error {
+	var svc corev1.Service
+	err := r.Client.Get(ctx, req.NamespacedName, &svc)
+	if !errors.IsNotFound(err) {
+		logger.Error(errKubernetesAPI, "error getting Service", "err", err, "svc", req.NamespacedName.String())
+		return err
+	} else if err == nil {
+		if _, ok := svc.Annotations[ServiceExposeAnnotation]; ok {
+			delete(svc.Annotations, ServiceExposeAnnotation)
+			err = r.Client.Update(ctx, &svc)
+			if err != nil {
+				logger.Error(errKubernetesAPI, "error updating Service", "err", err, "svc", req.NamespacedName.String())
+				return err
+			}
+		}
+	}
+
 	if nbResource.Status.PolicyName != nil {
 		for _, policy := range util.SplitTrim(*nbResource.Status.PolicyName, ",") {
 			var nbPolicy netbirdiov1.NBPolicy
@@ -593,7 +627,7 @@ func (r *NBResourceReconciler) handleDelete(ctx context.Context, req ctrl.Reques
 	}
 
 	nbGroupList := netbirdiov1.NBGroupList{}
-	err := r.Client.List(ctx, &nbGroupList, &client.ListOptions{Namespace: req.Namespace})
+	err = r.Client.List(ctx, &nbGroupList, &client.ListOptions{Namespace: req.Namespace})
 	if err != nil {
 		logger.Error(errKubernetesAPI, "error listing NBGroup", "err", err)
 		return err

internal/controller/nbroutingpeer_controller.go

@@ -52,12 +52,6 @@ func (r *NBRoutingPeerReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 
 	originalNBRP := nbrp.DeepCopy()
 	defer func() {
-		if err != nil {
-			// double check result is nil, otherwise error is not printed
-			// and exponential backoff doesn't work properly
-			res = ctrl.Result{}
-			return
-		}
 		if originalNBRP.DeletionTimestamp != nil && len(nbrp.Finalizers) == 0 {
 			return
 		}
@@ -67,6 +61,12 @@ func (r *NBRoutingPeerReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 				logger.Error(errKubernetesAPI, "error updating NBRoutingPeer Status", "err", err)
 			}
 		}
+		if err != nil {
+			// double check result is nil, otherwise error is not printed
+			// and exponential backoff doesn't work properly
+			res = ctrl.Result{}
+			return
+		}
 		if !res.Requeue && res.RequeueAfter == 0 {
 			res.RequeueAfter = defaultRequeueAfter
 		}
@@ -210,7 +210,7 @@ func (r *NBRoutingPeerReconciler) handleDeployment(ctx context.Context, req ctrl
 			nbrp.Status.Conditions = netbirdiov1.NBConditionFalse("internalError", fmt.Sprintf("error creating Deployment: %v", err))
 			return err
 		}
-	} else {
+	} else if err == nil {
 		updatedDeployment := routingPeerDeployment.DeepCopy()
 		updatedDeployment.ObjectMeta.Name = nbrp.Name
 		updatedDeployment.ObjectMeta.Namespace = nbrp.Namespace
@@ -291,7 +291,7 @@ func (r *NBRoutingPeerReconciler) handleDeployment(ctx context.Context, req ctrl
 		}
 	}
 
-	return nil
+	return err
 }
 
 // handleRouter reconcile network routing peer in NetBird management API
@@ -393,6 +393,14 @@ func (r *NBRoutingPeerReconciler) handleSetupKey(ctx context.Context, req ctrl.R
 		}
 		err = r.Client.Create(ctx, &skSecret)
 		if errors.IsAlreadyExists(err) {
+			err = r.Client.Get(ctx, req.NamespacedName, &skSecret)
+			if err != nil {
+				logger.Error(errNetBirdAPI, "error getting secret", "err", err)
+				return &ctrl.Result{}, err
+			}
+			skSecret.Data = map[string][]byte{
+				"setupKey": []byte(setupKey.Key),
+			}
 			err = r.Client.Update(ctx, &skSecret)
 		}
 
@@ -410,7 +418,7 @@ func (r *NBRoutingPeerReconciler) handleSetupKey(ctx context.Context, req ctrl.R
 			return &ctrl.Result{}, err
 		}
 
-		if err != nil || setupKey.Revoked {
+		if (err != nil && strings.Contains(err.Error(), "not found")) || setupKey == nil || setupKey.Revoked {
 			if setupKey != nil && setupKey.Revoked {
 				err = r.netbird.SetupKeys.Delete(ctx, *nbrp.Status.SetupKeyID)
 
@@ -586,16 +594,6 @@ func (r *NBRoutingPeerReconciler) handleDelete(ctx context.Context, req ctrl.Req
 		logger.Info("Setup key deleted", "id", setupKeyID)
 	}
 
-	if nbrp.Status.RouterID != nil {
-		err = r.netbird.Networks.Routers(*nbrp.Status.NetworkID).Delete(ctx, *nbrp.Status.RouterID)
-		if err != nil && !strings.Contains(err.Error(), "not found") {
-			logger.Error(errNetBirdAPI, "error deleting Network Router", "err", err)
-			return ctrl.Result{}, err
-		}
-
-		nbrp.Status.RouterID = nil
-	}
-
 	nbGroup := netbirdiov1.NBGroup{}
 	err = r.Client.Get(ctx, req.NamespacedName, &nbGroup)
 	if err != nil && !errors.IsNotFound(err) {
@@ -631,6 +629,7 @@ func (r *NBRoutingPeerReconciler) handleDelete(ctx context.Context, req ctrl.Req
 			}
 
 			nbrp.Status.NetworkID = nil
+			nbrp.Status.RouterID = nil
 		}
 	}
 

internal/controller/nbroutingpeer_controller_test.go

@@ -912,10 +912,8 @@ var _ = Describe("NBRoutingPeer Controller", func() {
 					})
 					When("NBRoutingPeer is set for deletion", func() {
 						networkDeleted := false
-						routerDeleted := false
 						BeforeEach(func() {
 							networkDeleted = false
-							routerDeleted = false
 							nbroutingpeer.Status.SetupKeyID = util.Ptr("skid")
 							Expect(k8sClient.Status().Update(ctx, nbroutingpeer)).To(Succeed())
 
@@ -953,14 +951,6 @@ var _ = Describe("NBRoutingPeer Controller", func() {
 								Expect(err).NotTo(HaveOccurred())
 								networkDeleted = true
 							})
-
-							mux.HandleFunc("/api/networks/test/routers/test", func(w http.ResponseWriter, r *http.Request) {
-								defer GinkgoRecover()
-								Expect(r.Method).To(Equal(http.MethodDelete))
-								_, err = w.Write([]byte(`{}`))
-								Expect(err).NotTo(HaveOccurred())
-								routerDeleted = true
-							})
 						})
 
 						It("should remove finalizer from NBGroup", func() {
@@ -980,7 +970,7 @@ var _ = Describe("NBRoutingPeer Controller", func() {
 								NamespacedName: typeNamespacedName,
 							})
 							Expect(err).NotTo(HaveOccurred())
-							Expect(routerDeleted).To(BeTrue())
+							Expect(networkDeleted).To(BeTrue())
 						})
 
 						It("should delete Network", func() {

internal/webhook/v1/nbresource_webhook.go

@@ -1,72 +0,0 @@
-package v1
-
-import (
-	"context"
-	"fmt"
-
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/types"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/webhook"
-	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
-
-	netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1"
-	"github.com/netbirdio/kubernetes-operator/internal/controller"
-)
-
-// nolint:unused
-// log is for logging in this package.
-var nbresourcelog = logf.Log.WithName("nbresource-resource")
-
-// SetupNBResourceWebhookWithManager registers the webhook for NBResource in the manager.
-func SetupNBResourceWebhookWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewWebhookManagedBy(mgr).For(&netbirdiov1.NBResource{}).
-		WithValidator(&NBResourceCustomValidator{client: mgr.GetClient()}).
-		Complete()
-}
-
-// NBResourceCustomValidator struct is responsible for validating the NBResource resource
-// when it is created, updated, or deleted.
-type NBResourceCustomValidator struct {
-	client client.Client
-}
-
-var _ webhook.CustomValidator = &NBResourceCustomValidator{}
-
-// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type NBResource.
-func (v *NBResourceCustomValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
-	return nil, nil
-}
-
-// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type NBResource.
-func (v *NBResourceCustomValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
-	return nil, nil
-}
-
-// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type NBResource.
-func (v *NBResourceCustomValidator) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
-	nbresource, ok := obj.(*netbirdiov1.NBResource)
-	if !ok {
-		return nil, fmt.Errorf("expected a NBResource object but got %T", obj)
-	}
-	nbresourcelog.Info("Validation for NBResource upon deletion", "name", nbresource.GetName())
-
-	var svc corev1.Service
-	err := v.client.Get(ctx, types.NamespacedName{Namespace: nbresource.Namespace, Name: nbresource.Name}, &svc)
-	if errors.IsNotFound(err) {
-		return nil, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	if _, ok := svc.Annotations[controller.ServiceExposeAnnotation]; ok && svc.DeletionTimestamp == nil {
-		return nil, fmt.Errorf("service %s/%s still has netbird.io/expose annotation", svc.Namespace, svc.Name)
-	}
-
-	return nil, nil
-}

internal/webhook/v1/nbresource_webhook_test.go

@@ -1,122 +0,0 @@
-package v1
-
-import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
-
-	netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1"
-)
-
-var _ = Describe("NBResource Webhook", func() {
-	var (
-		obj       *netbirdiov1.NBResource
-		oldObj    *netbirdiov1.NBResource
-		validator NBResourceCustomValidator
-	)
-
-	BeforeEach(func() {
-		obj = &netbirdiov1.NBResource{}
-		oldObj = &netbirdiov1.NBResource{}
-		validator = NBResourceCustomValidator{
-			client: k8sClient,
-		}
-	})
-
-	Context("When creating or updating NBResource under Validating Webhook", func() {
-		It("should allow creation", func() {
-			Expect(validator.ValidateCreate(ctx, obj)).Error().NotTo(HaveOccurred())
-		})
-		It("should allow update", func() {
-			Expect(validator.ValidateUpdate(ctx, oldObj, obj)).Error().NotTo(HaveOccurred())
-		})
-		When("No services are exposed", func() {
-			BeforeEach(func() {
-				obj.Name = "maw"
-				obj.Namespace = "default"
-				svc := &corev1.Service{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "ne",
-						Namespace: "default",
-					},
-					Spec: corev1.ServiceSpec{
-						Ports: []corev1.ServicePort{
-							{
-								Protocol:   corev1.ProtocolTCP,
-								Port:       80,
-								TargetPort: intstr.FromInt32(80),
-							},
-						},
-					},
-				}
-				Expect(k8sClient.Create(ctx, svc)).To(Succeed())
-			})
-			AfterEach(func() {
-				svc := &netbirdiov1.NBResource{}
-				err := k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "ne"}, svc)
-				if !errors.IsNotFound(err) {
-					Expect(err).NotTo(HaveOccurred())
-					if len(svc.Finalizers) > 0 {
-						svc.Finalizers = nil
-						Expect(k8sClient.Update(ctx, svc)).To(Succeed())
-					}
-					err = k8sClient.Delete(ctx, svc)
-					if !errors.IsNotFound(err) {
-						Expect(err).NotTo(HaveOccurred())
-					}
-				}
-			})
-			It("should allow deletion", func() {
-				Expect(validator.ValidateDelete(ctx, obj)).Error().NotTo(HaveOccurred())
-			})
-		})
-
-		When("A service is exposed", func() {
-			BeforeEach(func() {
-				obj.Name = "maw"
-				obj.Namespace = "default"
-				svc := &corev1.Service{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "maw",
-						Namespace: "default",
-						Annotations: map[string]string{
-							"netbird.io/expose": "true",
-						},
-					},
-					Spec: corev1.ServiceSpec{
-						Ports: []corev1.ServicePort{
-							{
-								Protocol:   corev1.ProtocolTCP,
-								Port:       80,
-								TargetPort: intstr.FromInt32(80),
-							},
-						},
-					},
-				}
-				Expect(k8sClient.Create(ctx, svc)).To(Succeed())
-			})
-			AfterEach(func() {
-				svc := &corev1.Service{}
-				err := k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "maw"}, svc)
-				if !errors.IsNotFound(err) {
-					Expect(err).NotTo(HaveOccurred())
-					if len(svc.Finalizers) > 0 {
-						svc.Finalizers = nil
-						Expect(k8sClient.Update(ctx, svc)).To(Succeed())
-					}
-					err = k8sClient.Delete(ctx, svc)
-					if !errors.IsNotFound(err) {
-						Expect(err).NotTo(HaveOccurred())
-					}
-				}
-			})
-			It("should deny deletion", func() {
-				Expect(validator.ValidateDelete(ctx, obj)).Error().To(HaveOccurred())
-			})
-		})
-	})
-})

internal/webhook/v1/nbroutingpeer_webhook.go

@@ -1,76 +0,0 @@
-package v1
-
-import (
-	"context"
-	"fmt"
-
-	"k8s.io/apimachinery/pkg/runtime"
-	ctrl "sigs.k8s.io/controller-runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/webhook"
-	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
-
-	netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1"
-)
-
-// nolint:unused
-// log is for logging in this package.
-var nbroutingpeerlog = logf.Log.WithName("nbroutingpeer-resource")
-
-// SetupNBRoutingPeerWebhookWithManager registers the webhook for NBRoutingPeer in the manager.
-func SetupNBRoutingPeerWebhookWithManager(mgr ctrl.Manager) error {
-	return ctrl.NewWebhookManagedBy(mgr).For(&netbirdiov1.NBRoutingPeer{}).
-		WithValidator(&NBRoutingPeerCustomValidator{client: mgr.GetClient()}).
-		Complete()
-}
-
-// NBRoutingPeerCustomValidator struct is responsible for validating the NBRoutingPeer resource
-// when it is created, updated, or deleted.
-type NBRoutingPeerCustomValidator struct {
-	client client.Client
-}
-
-var _ webhook.CustomValidator = &NBRoutingPeerCustomValidator{}
-
-// ValidateCreate implements webhook.CustomValidator so a webhook will be registered for the type NBRoutingPeer.
-func (v *NBRoutingPeerCustomValidator) ValidateCreate(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
-	return nil, nil
-}
-
-// ValidateUpdate implements webhook.CustomValidator so a webhook will be registered for the type NBRoutingPeer.
-func (v *NBRoutingPeerCustomValidator) ValidateUpdate(ctx context.Context, oldObj, newObj runtime.Object) (admission.Warnings, error) {
-	return nil, nil
-}
-
-// ValidateDelete implements webhook.CustomValidator so a webhook will be registered for the type NBRoutingPeer.
-func (v *NBRoutingPeerCustomValidator) ValidateDelete(ctx context.Context, obj runtime.Object) (admission.Warnings, error) {
-	nbroutingpeer, ok := obj.(*netbirdiov1.NBRoutingPeer)
-	if !ok {
-		return nil, fmt.Errorf("expected a NBRoutingPeer object but got %T", obj)
-	}
-	nbroutingpeerlog.Info("Validation for NBRoutingPeer upon deletion", "name", nbroutingpeer.GetName())
-
-	if nbroutingpeer.Status.NetworkID == nil {
-		return nil, nil
-	}
-
-	var nbResources netbirdiov1.NBResourceList
-	err := v.client.List(ctx, &nbResources)
-	if err != nil {
-		return nil, err
-	}
-
-	resourceValidator := &NBResourceCustomValidator{client: v.client}
-
-	for _, r := range nbResources.Items {
-		if r.Spec.NetworkID == *nbroutingpeer.Status.NetworkID {
-			_, err = resourceValidator.ValidateDelete(ctx, &r)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	return nil, nil
-}

internal/webhook/v1/nbroutingpeer_webhook_test.go

@@ -1,242 +0,0 @@
-package v1
-
-import (
-	. "github.com/onsi/ginkgo/v2"
-	. "github.com/onsi/gomega"
-	corev1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/apimachinery/pkg/util/intstr"
-
-	netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1"
-	"github.com/netbirdio/kubernetes-operator/internal/util"
-)
-
-var _ = Describe("NBRoutingPeer Webhook", func() {
-	var (
-		obj       *netbirdiov1.NBRoutingPeer
-		oldObj    *netbirdiov1.NBRoutingPeer
-		validator NBRoutingPeerCustomValidator
-	)
-
-	BeforeEach(func() {
-		obj = &netbirdiov1.NBRoutingPeer{}
-		oldObj = &netbirdiov1.NBRoutingPeer{}
-		validator = NBRoutingPeerCustomValidator{
-			client: k8sClient,
-		}
-	})
-
-	Context("When creating or updating NBRoutingPeer under Validating Webhook", func() {
-		It("should allow creation", func() {
-			Expect(validator.ValidateCreate(ctx, obj)).Error().NotTo(HaveOccurred())
-		})
-		It("should allow update", func() {
-			Expect(validator.ValidateUpdate(ctx, oldObj, obj)).Error().NotTo(HaveOccurred())
-		})
-		When("No NBResources Exist", func() {
-			It("should allow deletion", func() {
-				Expect(validator.ValidateDelete(ctx, obj)).Error().NotTo(HaveOccurred())
-			})
-		})
-		When("Deleteable NBResources Exist", func() {
-			BeforeEach(func() {
-				nbResource := &netbirdiov1.NBResource{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "isexist",
-						Namespace: "default",
-					},
-					Spec: netbirdiov1.NBResourceSpec{
-						Name:      "test1",
-						NetworkID: "test2",
-						Address:   "test3",
-						Groups:    []string{"test"},
-					},
-				}
-
-				Expect(k8sClient.Create(ctx, nbResource)).To(Succeed())
-
-				obj = &netbirdiov1.NBRoutingPeer{
-					Status: netbirdiov1.NBRoutingPeerStatus{
-						NetworkID: util.Ptr("test2"),
-					},
-				}
-			})
-
-			AfterEach(func() {
-				nbResource := &netbirdiov1.NBResource{}
-				err := k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "isexist"}, nbResource)
-				if !errors.IsNotFound(err) {
-					Expect(err).NotTo(HaveOccurred())
-					if len(nbResource.Finalizers) > 0 {
-						nbResource.Finalizers = nil
-						Expect(k8sClient.Update(ctx, nbResource)).To(Succeed())
-					}
-					err = k8sClient.Delete(ctx, nbResource)
-					if !errors.IsNotFound(err) {
-						Expect(err).NotTo(HaveOccurred())
-					}
-				}
-			})
-			It("should allow deletion", func() {
-				Expect(validator.ValidateDelete(ctx, obj)).Error().NotTo(HaveOccurred())
-			})
-		})
-		When("Exposed Services for Network Exist", func() {
-			BeforeEach(func() {
-				nbResource := &netbirdiov1.NBResource{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "maw",
-						Namespace: "default",
-					},
-					Spec: netbirdiov1.NBResourceSpec{
-						Name:      "test1",
-						NetworkID: "test2",
-						Address:   "test3",
-						Groups:    []string{"test"},
-					},
-				}
-
-				Expect(k8sClient.Create(ctx, nbResource)).To(Succeed())
-
-				svc := &corev1.Service{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "maw",
-						Namespace: "default",
-						Annotations: map[string]string{
-							"netbird.io/expose": "true",
-						},
-					},
-					Spec: corev1.ServiceSpec{
-						Ports: []corev1.ServicePort{
-							{
-								Protocol:   corev1.ProtocolTCP,
-								Port:       80,
-								TargetPort: intstr.FromInt32(80),
-							},
-						},
-					},
-				}
-				Expect(k8sClient.Create(ctx, svc)).To(Succeed())
-
-				obj = &netbirdiov1.NBRoutingPeer{
-					Status: netbirdiov1.NBRoutingPeerStatus{
-						NetworkID: util.Ptr("test2"),
-					},
-				}
-			})
-
-			AfterEach(func() {
-				nbResource := &netbirdiov1.NBResource{}
-				err := k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "maw"}, nbResource)
-				if !errors.IsNotFound(err) {
-					Expect(err).NotTo(HaveOccurred())
-					if len(nbResource.Finalizers) > 0 {
-						nbResource.Finalizers = nil
-						Expect(k8sClient.Update(ctx, nbResource)).To(Succeed())
-					}
-					err = k8sClient.Delete(ctx, nbResource)
-					if !errors.IsNotFound(err) {
-						Expect(err).NotTo(HaveOccurred())
-					}
-				}
-
-				svc := &corev1.Service{}
-				err = k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "maw"}, svc)
-				if !errors.IsNotFound(err) {
-					Expect(err).NotTo(HaveOccurred())
-					if len(svc.Finalizers) > 0 {
-						svc.Finalizers = nil
-						Expect(k8sClient.Update(ctx, svc)).To(Succeed())
-					}
-					err = k8sClient.Delete(ctx, svc)
-					if !errors.IsNotFound(err) {
-						Expect(err).NotTo(HaveOccurred())
-					}
-				}
-			})
-			It("should deny deletion", func() {
-				Expect(validator.ValidateDelete(ctx, obj)).Error().To(HaveOccurred())
-			})
-		})
-		When("Exposed NBResources do not belong to network", func() {
-			BeforeEach(func() {
-				nbResource := &netbirdiov1.NBResource{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "maw",
-						Namespace: "default",
-					},
-					Spec: netbirdiov1.NBResourceSpec{
-						Name:      "test1",
-						NetworkID: "test5",
-						Address:   "test3",
-						Groups:    []string{"test"},
-					},
-				}
-
-				Expect(k8sClient.Create(ctx, nbResource)).To(Succeed())
-
-				svc := &corev1.Service{
-					ObjectMeta: v1.ObjectMeta{
-						Name:      "maw",
-						Namespace: "default",
-						Annotations: map[string]string{
-							"netbird.io/expose": "true",
-						},
-					},
-					Spec: corev1.ServiceSpec{
-						Ports: []corev1.ServicePort{
-							{
-								Protocol:   corev1.ProtocolTCP,
-								Port:       80,
-								TargetPort: intstr.FromInt32(80),
-							},
-						},
-					},
-				}
-				Expect(k8sClient.Create(ctx, svc)).To(Succeed())
-
-				obj = &netbirdiov1.NBRoutingPeer{
-					Status: netbirdiov1.NBRoutingPeerStatus{
-						NetworkID: util.Ptr("test2"),
-					},
-				}
-			})
-
-			AfterEach(func() {
-				nbResource := &netbirdiov1.NBResource{}
-				err := k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "maw"}, nbResource)
-				if !errors.IsNotFound(err) {
-					Expect(err).NotTo(HaveOccurred())
-					if len(nbResource.Finalizers) > 0 {
-						nbResource.Finalizers = nil
-						Expect(k8sClient.Update(ctx, nbResource)).To(Succeed())
-					}
-					err = k8sClient.Delete(ctx, nbResource)
-					if !errors.IsNotFound(err) {
-						Expect(err).NotTo(HaveOccurred())
-					}
-				}
-
-				svc := &corev1.Service{}
-				err = k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "maw"}, svc)
-				if !errors.IsNotFound(err) {
-					Expect(err).NotTo(HaveOccurred())
-					if len(svc.Finalizers) > 0 {
-						svc.Finalizers = nil
-						Expect(k8sClient.Update(ctx, svc)).To(Succeed())
-					}
-					err = k8sClient.Delete(ctx, svc)
-					if !errors.IsNotFound(err) {
-						Expect(err).NotTo(HaveOccurred())
-					}
-				}
-			})
-			It("should allow deletion", func() {
-				Expect(validator.ValidateDelete(ctx, obj)).Error().NotTo(HaveOccurred())
-			})
-		})
-	})
-
-})

internal/webhook/v1/webhook_suite_test.go

@@ -124,12 +124,6 @@ var _ = BeforeSuite(func() {
 	err = SetupNBSetupKeyWebhookWithManager(mgr)
 	Expect(err).NotTo(HaveOccurred())
 
-	err = SetupNBResourceWebhookWithManager(mgr)
-	Expect(err).NotTo(HaveOccurred())
-
-	err = SetupNBRoutingPeerWebhookWithManager(mgr)
-	Expect(err).NotTo(HaveOccurred())
-
 	err = SetupNBGroupWebhookWithManager(mgr)
 	Expect(err).NotTo(HaveOccurred())