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

Enforce import ordering and aliases (#216)

Browse Source 
This change ensures import ordering and aliases is standardized.
Something that is extra important when working with Kuberentes apis that
have "standard" import aliases.

Signed-off-by: Philip Laine <philip.laine@gmail.com>
This commit is contained in:
Philip Laine
2026-04-30 13:39:11 +02:00
committed by GitHub
parent cae1ab796b
commit 74012deb27
35 changed files with 584 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/controller/service_controller_test.go
+40 -39
View File
@@ -1,16 +1,17 @@
package controller
import (
netbirdiov1 "github.com/netbirdio/kubernetes-operator/api/v1"
"github.com/netbirdio/kubernetes-operator/internal/util"
. "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"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/intstr"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
nbv1 "github.com/netbirdio/kubernetes-operator/api/v1"
"github.com/netbirdio/kubernetes-operator/internal/util"
)
var _ = Describe("Service Controller", func() {
@@ -26,7 +27,7 @@ var _ = Describe("Service Controller", func() {
BeforeEach(func() {
service = &corev1.Service{
ObjectMeta: v1.ObjectMeta{
ObjectMeta: metav1.ObjectMeta{
Name: "test-resource",
Namespace: "default",
},
@@ -85,7 +86,7 @@ var _ = Describe("Service Controller", func() {
}
}
nbrp := &netbirdiov1.NBRoutingPeer{}
nbrp := &nbv1.NBRoutingPeer{}
err = k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "router"}, nbrp)
if !errors.IsNotFound(err) {
if len(nbrp.Finalizers) > 0 {
@@ -99,7 +100,7 @@ var _ = Describe("Service Controller", func() {
}
}
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
err = k8sClient.Get(ctx, typeNamespacedName, nbResource)
if !errors.IsNotFound(err) {
if len(nbResource.Finalizers) > 0 {
@@ -123,7 +124,7 @@ var _ = Describe("Service Controller", func() {
Expect(err).NotTo(HaveOccurred())
Expect(k8sClient.Get(ctx, typeNamespacedName, service)).To(Succeed())
Expect(service.Finalizers).To(BeEmpty())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).NotTo(Succeed())
})
})
@@ -142,7 +143,7 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
Expect(res.RequeueAfter).NotTo(BeZero())
nbrp := &netbirdiov1.NBRoutingPeer{}
nbrp := &nbv1.NBRoutingPeer{}
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: typeNamespacedName.Namespace, Name: "router"}, nbrp)).To(Succeed())
Expect(nbrp.Labels).To(HaveKeyWithValue("dog", "bark"))
res, err = controllerReconciler.Reconcile(ctx, reconcile.Request{
@@ -161,12 +162,12 @@ var _ = Describe("Service Controller", func() {
})
When("NBRoutingPeer exists", func() {
BeforeEach(func() {
nbrp := &netbirdiov1.NBRoutingPeer{
ObjectMeta: v1.ObjectMeta{
nbrp := &nbv1.NBRoutingPeer{
ObjectMeta: metav1.ObjectMeta{
Namespace: typeNamespacedName.Namespace,
Name: "router",
},
Spec: netbirdiov1.NBRoutingPeerSpec{},
Spec: nbv1.NBRoutingPeerSpec{},
}
Expect(k8sClient.Create(ctx, nbrp)).To(Succeed())
@@ -195,7 +196,7 @@ var _ = Describe("Service Controller", func() {
NamespacedName: typeNamespacedName,
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.Address).To(Equal(typeNamespacedName.Name + "." + typeNamespacedName.Namespace + "." + controllerReconciler.ClusterDNS))
Expect(nbResource.Spec.Groups).To(ConsistOf([]string{controllerReconciler.ClusterName + "-" + typeNamespacedName.Namespace + "-" + typeNamespacedName.Name}))
@@ -218,7 +219,7 @@ var _ = Describe("Service Controller", func() {
NamespacedName: typeNamespacedName,
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.PolicyName).To(Equal(policyName))
Expect(nbResource.Spec.TCPPorts).To(ConsistOf([]int32{443, 80}))
@@ -234,7 +235,7 @@ var _ = Describe("Service Controller", func() {
NamespacedName: typeNamespacedName,
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.PolicyName).To(Equal(policyName))
Expect(nbResource.Spec.TCPPorts).To(ConsistOf([]int32{80}))
@@ -250,7 +251,7 @@ var _ = Describe("Service Controller", func() {
NamespacedName: typeNamespacedName,
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.PolicyName).To(Equal(policyName))
Expect(nbResource.Spec.TCPPorts).To(ConsistOf([]int32{80, 443}))
@@ -266,7 +267,7 @@ var _ = Describe("Service Controller", func() {
NamespacedName: typeNamespacedName,
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.Name).To(Equal("meow"))
})
@@ -279,7 +280,7 @@ var _ = Describe("Service Controller", func() {
NamespacedName: typeNamespacedName,
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.Groups).To(ConsistOf([]string{"meow", "wow", policyName}))
})
@@ -289,12 +290,12 @@ var _ = Describe("Service Controller", func() {
})
When("Service is already exposed", func() {
BeforeEach(func() {
nbResource := &netbirdiov1.NBResource{
ObjectMeta: v1.ObjectMeta{
nbResource := &nbv1.NBResource{
ObjectMeta: metav1.ObjectMeta{
Name: typeNamespacedName.Name,
Namespace: typeNamespacedName.Namespace,
},
Spec: netbirdiov1.NBResourceSpec{
Spec: nbv1.NBResourceSpec{
Name: typeNamespacedName.Namespace + "-" + typeNamespacedName.Name,
Address: typeNamespacedName.Name + "." + typeNamespacedName.Namespace + "." + controllerReconciler.ClusterDNS,
Groups: []string{controllerReconciler.ClusterName + "-" + typeNamespacedName.Namespace + "-" + typeNamespacedName.Name},
@@ -309,12 +310,12 @@ var _ = Describe("Service Controller", func() {
service.Annotations[ServiceExposeAnnotation] = "true"
Expect(k8sClient.Update(ctx, service)).To(Succeed())
nbrp := &netbirdiov1.NBRoutingPeer{
ObjectMeta: v1.ObjectMeta{
nbrp := &nbv1.NBRoutingPeer{
ObjectMeta: metav1.ObjectMeta{
Namespace: typeNamespacedName.Namespace,
Name: "router",
},
Spec: netbirdiov1.NBRoutingPeerSpec{},
Spec: nbv1.NBRoutingPeerSpec{},
}
Expect(k8sClient.Create(ctx, nbrp)).To(Succeed())
@@ -332,7 +333,7 @@ var _ = Describe("Service Controller", func() {
NamespacedName: typeNamespacedName,
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
err = k8sClient.Get(ctx, typeNamespacedName, nbResource)
if !errors.IsNotFound(err) {
Expect(nbResource.DeletionTimestamp).NotTo(BeNil())
@@ -349,7 +350,7 @@ var _ = Describe("Service Controller", func() {
})
When("Nothing changes", func() {
It("should do nothing", func() {
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
resourceVersion := nbResource.ResourceVersion
@@ -358,7 +359,7 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource = &netbirdiov1.NBResource{}
nbResource = &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(resourceVersion).To(BeEquivalentTo(nbResource.ResourceVersion))
})
@@ -372,14 +373,14 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.PolicyName).To(Equal(policyName))
})
})
When("policy is removed", func() {
It("should remove policy in NBResource spec", func() {
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
nbResource.Spec.PolicyName = policyName
Expect(k8sClient.Update(ctx, nbResource)).To(Succeed())
@@ -389,14 +390,14 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource = &netbirdiov1.NBResource{}
nbResource = &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.PolicyName).To(Equal(""))
})
})
When("policy ports changes", func() {
It("should update ports in NBResource spec", func() {
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
nbResource.Spec.PolicyName = policyName
nbResource.Spec.TCPPorts = []int32{443, 80}
@@ -412,7 +413,7 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource = &netbirdiov1.NBResource{}
nbResource = &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.TCPPorts).To(ConsistOf([]int32{80}))
Expect(nbResource.Spec.UDPPorts).To(ConsistOf([]int32{80}))
@@ -420,7 +421,7 @@ var _ = Describe("Service Controller", func() {
})
When("policy protocol changes", func() {
It("should update protocol in NBResource spec", func() {
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
nbResource.Spec.PolicyName = policyName
nbResource.Spec.TCPPorts = []int32{443, 80}
@@ -436,7 +437,7 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource = &netbirdiov1.NBResource{}
nbResource = &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.TCPPorts).To(ConsistOf([]int32{80, 443}))
Expect(nbResource.Spec.UDPPorts).To(BeEmpty())
@@ -444,7 +445,7 @@ var _ = Describe("Service Controller", func() {
})
When("policy friendly name changes", func() {
It("should update policy friendly name in NBResource spec", func() {
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
nbResource.Spec.PolicyName = policyName
Expect(k8sClient.Update(ctx, nbResource)).To(Succeed())
@@ -458,14 +459,14 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource = &netbirdiov1.NBResource{}
nbResource = &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.PolicyFriendlyName).To(BeEquivalentTo(map[string]string{"test": "toast", "meow": "meow"}))
})
})
When("policy source groups changes", func() {
It("should update policy source groups in NBResource spec", func() {
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
nbResource.Spec.PolicyName = policyName
Expect(k8sClient.Update(ctx, nbResource)).To(Succeed())
@@ -479,7 +480,7 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource = &netbirdiov1.NBResource{}
nbResource = &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.PolicySourceGroups).To(BeEquivalentTo([]string{"test"}))
})
@@ -493,7 +494,7 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.Name).To(Equal("meow"))
})
@@ -507,7 +508,7 @@ var _ = Describe("Service Controller", func() {
})
Expect(err).NotTo(HaveOccurred())
nbResource := &netbirdiov1.NBResource{}
nbResource := &nbv1.NBResource{}
Expect(k8sClient.Get(ctx, typeNamespacedName, nbResource)).To(Succeed())
Expect(nbResource.Spec.Groups).To(ConsistOf([]string{"a7medmo7sen", "pewpewpew"}))
})