diff --git a/cmd/main.go b/cmd/main.go index 5f98103..e9af517 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -206,7 +206,6 @@ func main() { nbSetupKeyController := &controller.NBSetupKeyReconciler{ Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), } if err = nbSetupKeyController.SetupWithManager(mgr); err != nil { setupLog.Error(err, "unable to create controller", "controller", "NBSetupKey") @@ -228,7 +227,6 @@ func main() { if len(netbirdAPIKey) > 0 { if err = (&controller.NBRoutingPeerReconciler{ Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), ClientImage: clientImage, ClusterName: clusterName, APIKey: netbirdAPIKey, @@ -248,7 +246,6 @@ func main() { if err = (&controller.ServiceReconciler{ Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), ClusterName: clusterName, ClusterDNS: clusterDNS, NamespacedNetworks: namespacedNetworks, @@ -261,7 +258,6 @@ func main() { if err = (&controller.NBResourceReconciler{ Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), APIKey: netbirdAPIKey, ManagementURL: managementURL, AllowAutomaticPolicyCreation: allowAutomaticPolicyCreation, @@ -274,7 +270,6 @@ func main() { if err = (&controller.NBGroupReconciler{ Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), APIKey: netbirdAPIKey, ManagementURL: managementURL, }).SetupWithManager(mgr); err != nil { @@ -284,7 +279,6 @@ func main() { if err = (&controller.NBPolicyReconciler{ Client: mgr.GetClient(), - Scheme: mgr.GetScheme(), APIKey: netbirdAPIKey, ManagementURL: managementURL, }).SetupWithManager(mgr); err != nil { diff --git a/internal/controller/nbgroup_controller.go b/internal/controller/nbgroup_controller.go index 8226a79..5ca4bc7 100644 --- a/internal/controller/nbgroup_controller.go +++ b/internal/controller/nbgroup_controller.go @@ -6,22 +6,21 @@ import ( "strings" "time" + "github.com/go-logr/logr" + netbird "github.com/netbirdio/netbird/shared/management/client/rest" + "github.com/netbirdio/netbird/shared/management/http/api" "k8s.io/apimachinery/pkg/api/errors" - "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" - "github.com/go-logr/logr" netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1" "github.com/netbirdio/kubernetes-operator/internal/util" - netbird "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/shared/management/http/api" ) // NBGroupReconciler reconciles a NBGroup object type NBGroupReconciler struct { client.Client - Scheme *runtime.Scheme + APIKey string ManagementURL string netbird *netbird.Client diff --git a/internal/controller/nbgroup_controller_test.go b/internal/controller/nbgroup_controller_test.go index c396e8f..c1c16f0 100644 --- a/internal/controller/nbgroup_controller_test.go +++ b/internal/controller/nbgroup_controller_test.go @@ -85,7 +85,6 @@ var _ = Describe("NBGroup Controller", func() { By("Reconciling the created resource") controllerReconciler := &NBGroupReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, } @@ -124,7 +123,6 @@ var _ = Describe("NBGroup Controller", func() { By("Reconciling the created resource") controllerReconciler := &NBGroupReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, } @@ -174,7 +172,6 @@ var _ = Describe("NBGroup Controller", func() { By("Reconciling the deleting resource") controllerReconciler := &NBGroupReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, } @@ -201,7 +198,6 @@ var _ = Describe("NBGroup Controller", func() { By("Reconciling the deleting resource") controllerReconciler := &NBGroupReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, } @@ -243,7 +239,6 @@ var _ = Describe("NBGroup Controller", func() { By("Reconciling the deleting resource") controllerReconciler := &NBGroupReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, } @@ -271,7 +266,6 @@ var _ = Describe("NBGroup Controller", func() { It("should re-use existing group ID", func() { controllerReconciler := &NBGroupReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, } @@ -309,7 +303,6 @@ var _ = Describe("NBGroup Controller", func() { It("Should requeue and create group on next run", func() { controllerReconciler := &NBGroupReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, } diff --git a/internal/controller/nbpolicy_controller.go b/internal/controller/nbpolicy_controller.go index 8c464db..df739a1 100644 --- a/internal/controller/nbpolicy_controller.go +++ b/internal/controller/nbpolicy_controller.go @@ -7,23 +7,22 @@ import ( "strconv" "strings" + "github.com/go-logr/logr" + netbird "github.com/netbirdio/netbird/shared/management/client/rest" + "github.com/netbirdio/netbird/shared/management/http/api" "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" - "github.com/go-logr/logr" netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1" "github.com/netbirdio/kubernetes-operator/internal/util" - netbird "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/shared/management/http/api" ) // NBPolicyReconciler reconciles a NBPolicy object type NBPolicyReconciler struct { client.Client - Scheme *runtime.Scheme + ClusterName string APIKey string ManagementURL string diff --git a/internal/controller/nbpolicy_controller_test.go b/internal/controller/nbpolicy_controller_test.go index 16d80f1..02db66a 100644 --- a/internal/controller/nbpolicy_controller_test.go +++ b/internal/controller/nbpolicy_controller_test.go @@ -90,7 +90,6 @@ var _ = Describe("NBPolicy Controller", func() { It("should not create any policy", func() { controllerReconciler := &NBPolicyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "Kubernetes", } @@ -119,7 +118,6 @@ var _ = Describe("NBPolicy Controller", func() { It("should create 1 policy", func() { controllerReconciler := &NBPolicyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "Kubernetes", } @@ -218,7 +216,6 @@ var _ = Describe("NBPolicy Controller", func() { It("should delete tcp policy", func() { controllerReconciler := &NBPolicyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "Kubernetes", } @@ -261,7 +258,6 @@ var _ = Describe("NBPolicy Controller", func() { It("should create 1 policy", func() { controllerReconciler := &NBPolicyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "Kubernetes", } @@ -360,7 +356,6 @@ var _ = Describe("NBPolicy Controller", func() { It("should delete udp policy", func() { controllerReconciler := &NBPolicyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "Kubernetes", } @@ -403,7 +398,6 @@ var _ = Describe("NBPolicy Controller", func() { It("Should delete protocol policy", func() { controllerReconciler := &NBPolicyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "Kubernetes", } @@ -484,7 +478,6 @@ var _ = Describe("NBPolicy Controller", func() { It("Should give all information to Update method", func() { controllerReconciler := &NBPolicyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "Kubernetes", } @@ -603,7 +596,6 @@ var _ = Describe("NBPolicy Controller", func() { It("should delete Policies", func() { controllerReconciler := &NBPolicyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "Kubernetes", } diff --git a/internal/controller/nbresource_controller.go b/internal/controller/nbresource_controller.go index 3437b22..ec1ea6d 100644 --- a/internal/controller/nbresource_controller.go +++ b/internal/controller/nbresource_controller.go @@ -8,23 +8,21 @@ import ( "strings" "time" + "github.com/go-logr/logr" + netbird "github.com/netbirdio/netbird/shared/management/client/rest" + "github.com/netbirdio/netbird/shared/management/http/api" 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" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/handler" + "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "github.com/go-logr/logr" netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1" "github.com/netbirdio/kubernetes-operator/internal/util" - netbird "github.com/netbirdio/netbird/shared/management/client/rest" - "github.com/netbirdio/netbird/shared/management/http/api" ) var ( @@ -34,7 +32,7 @@ var ( // NBResourceReconciler reconciles a NBResource object type NBResourceReconciler struct { client.Client - Scheme *runtime.Scheme + APIKey string ManagementURL string AllowAutomaticPolicyCreation bool @@ -678,7 +676,7 @@ func (r *NBResourceReconciler) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). For(&netbirdiov1.NBResource{}). Named("nbresource"). - Watches(&netbirdiov1.NBGroup{}, handler.EnqueueRequestForOwner(r.Scheme, mgr.GetRESTMapper(), &netbirdiov1.NBResource{})). + Watches(&netbirdiov1.NBGroup{}, handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &netbirdiov1.NBResource{})). Watches(&netbirdiov1.NBPolicy{}, handler.EnqueueRequestsFromMapFunc(func(ctx context.Context, obj client.Object) []reconcile.Request { if v, ok := obj.GetAnnotations()["netbird.io/generated-by"]; ok { return []reconcile.Request{ diff --git a/internal/controller/nbresource_controller_test.go b/internal/controller/nbresource_controller_test.go index a28bfdf..bf624e3 100644 --- a/internal/controller/nbresource_controller_test.go +++ b/internal/controller/nbresource_controller_test.go @@ -47,7 +47,6 @@ var _ = Describe("NBResource Controller", func() { netbirdClient = netbird.New(server.URL, "ABC") controllerReconciler = &NBResourceReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClusterName: "kubernetes", DefaultLabels: map[string]string{"dog": "bark"}, diff --git a/internal/controller/nbroutingpeer_controller.go b/internal/controller/nbroutingpeer_controller.go index a20ce6a..e9ebb1e 100644 --- a/internal/controller/nbroutingpeer_controller.go +++ b/internal/controller/nbroutingpeer_controller.go @@ -10,7 +10,6 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/handler" @@ -25,7 +24,7 @@ import ( // NBRoutingPeerReconciler reconciles a NBRoutingPeer object type NBRoutingPeerReconciler struct { client.Client - Scheme *runtime.Scheme + ClientImage string ClusterName string APIKey string @@ -670,8 +669,8 @@ func (r *NBRoutingPeerReconciler) SetupWithManager(mgr ctrl.Manager) error { return ctrl.NewControllerManagedBy(mgr). For(&netbirdiov1.NBRoutingPeer{}). Named("nbroutingpeer"). - Watches(&appsv1.Deployment{}, handler.EnqueueRequestForOwner(r.Scheme, mgr.GetRESTMapper(), &netbirdiov1.NBRoutingPeer{})). - Watches(&corev1.Secret{}, handler.EnqueueRequestForOwner(r.Scheme, mgr.GetRESTMapper(), &netbirdiov1.NBRoutingPeer{})). - Watches(&netbirdiov1.NBGroup{}, handler.EnqueueRequestForOwner(r.Scheme, mgr.GetRESTMapper(), &netbirdiov1.NBRoutingPeer{})). + Watches(&appsv1.Deployment{}, handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &netbirdiov1.NBRoutingPeer{})). + Watches(&corev1.Secret{}, handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &netbirdiov1.NBRoutingPeer{})). + Watches(&netbirdiov1.NBGroup{}, handler.EnqueueRequestForOwner(mgr.GetScheme(), mgr.GetRESTMapper(), &netbirdiov1.NBRoutingPeer{})). Complete(r) } diff --git a/internal/controller/nbroutingpeer_controller_test.go b/internal/controller/nbroutingpeer_controller_test.go index 18a76e3..02b638f 100644 --- a/internal/controller/nbroutingpeer_controller_test.go +++ b/internal/controller/nbroutingpeer_controller_test.go @@ -48,7 +48,6 @@ var _ = Describe("NBRoutingPeer Controller", func() { netbirdClient = netbird.New(server.URL, "ABC") controllerReconciler = &NBRoutingPeerReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), netbird: netbirdClient, ClientImage: "netbirdio/netbird:latest", ClusterName: "kubernetes", diff --git a/internal/controller/nbsetupkey_controller.go b/internal/controller/nbsetupkey_controller.go index f999370..c8c732a 100644 --- a/internal/controller/nbsetupkey_controller.go +++ b/internal/controller/nbsetupkey_controller.go @@ -24,7 +24,6 @@ import ( corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" @@ -37,7 +36,7 @@ import ( // NBSetupKeyReconciler reconciles a NBSetupKey object type NBSetupKeyReconciler struct { client.Client - Scheme *runtime.Scheme + ReferencedSecrets map[string]types.NamespacedName } diff --git a/internal/controller/nbsetupkey_controller_test.go b/internal/controller/nbsetupkey_controller_test.go index 2b73889..f417e8e 100644 --- a/internal/controller/nbsetupkey_controller_test.go +++ b/internal/controller/nbsetupkey_controller_test.go @@ -79,7 +79,6 @@ var _ = Describe("NBSetupKey Controller", func() { It("should set status to not ready", func() { controllerReconciler := &NBSetupKeyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), ReferencedSecrets: make(map[string]types.NamespacedName), } @@ -125,7 +124,6 @@ var _ = Describe("NBSetupKey Controller", func() { controllerReconciler := &NBSetupKeyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), ReferencedSecrets: make(map[string]types.NamespacedName), } @@ -151,7 +149,6 @@ var _ = Describe("NBSetupKey Controller", func() { controllerReconciler := &NBSetupKeyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), ReferencedSecrets: make(map[string]types.NamespacedName), } @@ -177,7 +174,6 @@ var _ = Describe("NBSetupKey Controller", func() { controllerReconciler := &NBSetupKeyReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), ReferencedSecrets: make(map[string]types.NamespacedName), } diff --git a/internal/controller/service_controller.go b/internal/controller/service_controller.go index 7e7cced..f90469d 100644 --- a/internal/controller/service_controller.go +++ b/internal/controller/service_controller.go @@ -8,21 +8,21 @@ import ( "time" "github.com/go-logr/logr" - netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1" - "github.com/netbirdio/kubernetes-operator/internal/util" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/types" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" + + netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1" + "github.com/netbirdio/kubernetes-operator/internal/util" ) // ServiceReconciler reconciles a Service object type ServiceReconciler struct { client.Client - Scheme *runtime.Scheme + ClusterName string ClusterDNS string NamespacedNetworks bool diff --git a/internal/controller/service_controller_test.go b/internal/controller/service_controller_test.go index 6077c30..50bb605 100644 --- a/internal/controller/service_controller_test.go +++ b/internal/controller/service_controller_test.go @@ -62,7 +62,6 @@ var _ = Describe("Service Controller", func() { Expect(k8sClient.Create(ctx, service)).To(Succeed()) controllerReconciler = &ServiceReconciler{ Client: k8sClient, - Scheme: k8sClient.Scheme(), ClusterName: "kubernetes", NamespacedNetworks: false, ClusterDNS: "svc.cluster.local",