Skip to content

Commit ea9f1cb

Browse files
phillebabaphillebaba
authored
Modernize for Go 1.26 (#232)
This change replaces all uses of pointer utils with the new `new` function which does the same job. Signed-off-by: Philip Laine <philip.laine@gmail.com>
1 parent 69afe3a commit ea9f1cb

14 files changed

Lines changed: 71 additions & 88 deletions

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ require (
1616
k8s.io/api v0.36.0
1717
k8s.io/apimachinery v0.36.0
1818
k8s.io/client-go v0.36.0
19-
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
2019
sigs.k8s.io/controller-runtime v0.24.0
2120
sigs.k8s.io/gateway-api v1.5.1
2221
sigs.k8s.io/structured-merge-diff/v6 v6.4.0
@@ -103,6 +102,7 @@ require (
103102
k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
104103
k8s.io/klog/v2 v2.140.0 // indirect
105104
k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect
105+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
106106
sigs.k8s.io/controller-tools v0.20.1 // indirect
107107
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
108108
sigs.k8s.io/randfill v1.0.0 // indirect

‎internal/controller/httproute_controller.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import (
2323
nbv1alpha1 "github.com/netbirdio/kubernetes-operator/api/v1alpha1"
2424
"github.com/netbirdio/kubernetes-operator/internal/gatewayutil"
2525
"github.com/netbirdio/kubernetes-operator/internal/k8sutil"
26-
"github.com/netbirdio/kubernetes-operator/internal/util"
2726
nbv1alpha1ac "github.com/netbirdio/kubernetes-operator/pkg/applyconfigurations/api/v1alpha1"
2827
)
2928

@@ -148,9 +147,9 @@ func (r *HTTPRouteReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
148147
Domain: string(hostname),
149148
Enabled: true,
150149
Name: string(hostname),
151-
Mode: util.Ptr(api.ServiceRequestModeHttp),
152-
PassHostHeader: util.Ptr(false),
153-
RewriteRedirects: util.Ptr(false),
150+
Mode: new(api.ServiceRequestModeHttp),
151+
PassHostHeader: new(false),
152+
RewriteRedirects: new(false),
154153
Targets: &targets,
155154
}
156155

‎internal/controller/nbgroup_controller_test.go‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
"github.com/netbirdio/netbird/shared/management/http/api"
2020

2121
nbv1 "github.com/netbirdio/kubernetes-operator/api/v1"
22-
"github.com/netbirdio/kubernetes-operator/internal/util"
2322
)
2423

2524
var _ = Describe("NBGroup Controller", func() {
@@ -160,7 +159,7 @@ var _ = Describe("NBGroup Controller", func() {
160159
deleteGroup := func() {
161160
GinkgoHelper()
162161
By("Adding the group ID in status")
163-
nbGroup.Status.GroupID = util.Ptr("Test")
162+
nbGroup.Status.GroupID = new("Test")
164163
err := k8sClient.Status().Update(ctx, &nbGroup)
165164
Expect(err).NotTo(HaveOccurred())
166165

@@ -285,7 +284,7 @@ var _ = Describe("NBGroup Controller", func() {
285284
Expect(err).NotTo(HaveOccurred())
286285
})
287286

288-
nbGroup.Status.GroupID = util.Ptr("Toast")
287+
nbGroup.Status.GroupID = new("Toast")
289288
Expect(k8sClient.Status().Update(ctx, &nbGroup)).To(Succeed())
290289

291290
_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
@@ -329,7 +328,7 @@ var _ = Describe("NBGroup Controller", func() {
329328
}
330329
})
331330

332-
nbGroup.Status.GroupID = util.Ptr("Toast")
331+
nbGroup.Status.GroupID = new("Toast")
333332
Expect(k8sClient.Status().Update(ctx, &nbGroup)).To(Succeed())
334333

335334
res, err := controllerReconciler.Reconcile(ctx, reconcile.Request{

‎internal/controller/nbpolicy_controller_test.go‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/netbirdio/netbird/shared/management/http/api"
2323

2424
nbv1 "github.com/netbirdio/kubernetes-operator/api/v1"
25-
"github.com/netbirdio/kubernetes-operator/internal/util"
2625
)
2726

2827
var _ = Describe("NBPolicy Controller", func() {
@@ -171,13 +170,13 @@ var _ = Describe("NBPolicy Controller", func() {
171170
err = json.Unmarshal(bs, &policyReq)
172171
Expect(err).NotTo(HaveOccurred())
173172
Expect(policyReq.Name).To(Equal("Test TCP"))
174-
Expect(policyReq.Description).To(Or(BeNil(), BeEquivalentTo(util.Ptr(""))))
173+
Expect(policyReq.Description).To(Or(BeNil(), BeEquivalentTo(new(""))))
175174
Expect(policyReq.Enabled).To(BeTrue())
176175
Expect(policyReq.SourcePostureChecks).To(BeNil())
177176
Expect(policyReq.Rules).To(HaveLen(1))
178177
Expect(policyReq.Rules[0].Action).To(BeEquivalentTo(api.PolicyRuleActionAccept))
179178
Expect(policyReq.Rules[0].Bidirectional).To(BeTrue())
180-
Expect(policyReq.Rules[0].Description).To(Or(BeNil(), BeEquivalentTo(util.Ptr(""))))
179+
Expect(policyReq.Rules[0].Description).To(Or(BeNil(), BeEquivalentTo(new(""))))
181180
Expect(policyReq.Rules[0].DestinationResource).To(BeNil())
182181
Expect(policyReq.Rules[0].Destinations).NotTo(BeNil())
183182
Expect(*policyReq.Rules[0].Destinations).To(HaveLen(1))
@@ -220,7 +219,7 @@ var _ = Describe("NBPolicy Controller", func() {
220219
}
221220

222221
nbpolicy.Status.ManagedServiceList = append(nbpolicy.Status.ManagedServiceList, "default/noexist")
223-
nbpolicy.Status.TCPPolicyID = util.Ptr("policyid")
222+
nbpolicy.Status.TCPPolicyID = new("policyid")
224223
Expect(k8sClient.Status().Update(ctx, nbpolicy)).To(Succeed())
225224

226225
mux.HandleFunc("/api/groups", func(w http.ResponseWriter, r *http.Request) {
@@ -309,13 +308,13 @@ var _ = Describe("NBPolicy Controller", func() {
309308
err = json.Unmarshal(bs, &policyReq)
310309
Expect(err).NotTo(HaveOccurred())
311310
Expect(policyReq.Name).To(Equal("Test UDP"))
312-
Expect(policyReq.Description).To(Or(BeNil(), BeEquivalentTo(util.Ptr(""))))
311+
Expect(policyReq.Description).To(Or(BeNil(), BeEquivalentTo(new(""))))
313312
Expect(policyReq.Enabled).To(BeTrue())
314313
Expect(policyReq.SourcePostureChecks).To(BeNil())
315314
Expect(policyReq.Rules).To(HaveLen(1))
316315
Expect(policyReq.Rules[0].Action).To(BeEquivalentTo(api.PolicyRuleActionAccept))
317316
Expect(policyReq.Rules[0].Bidirectional).To(BeTrue())
318-
Expect(policyReq.Rules[0].Description).To(Or(BeNil(), BeEquivalentTo(util.Ptr(""))))
317+
Expect(policyReq.Rules[0].Description).To(Or(BeNil(), BeEquivalentTo(new(""))))
319318
Expect(policyReq.Rules[0].DestinationResource).To(BeNil())
320319
Expect(policyReq.Rules[0].Destinations).NotTo(BeNil())
321320
Expect(*policyReq.Rules[0].Destinations).To(HaveLen(1))
@@ -358,7 +357,7 @@ var _ = Describe("NBPolicy Controller", func() {
358357
}
359358

360359
nbpolicy.Status.ManagedServiceList = append(nbpolicy.Status.ManagedServiceList, "default/noexist")
361-
nbpolicy.Status.UDPPolicyID = util.Ptr("policyid")
360+
nbpolicy.Status.UDPPolicyID = new("policyid")
362361
Expect(k8sClient.Status().Update(ctx, nbpolicy)).To(Succeed())
363362

364363
mux.HandleFunc("/api/groups", func(w http.ResponseWriter, r *http.Request) {
@@ -425,7 +424,7 @@ var _ = Describe("NBPolicy Controller", func() {
425424
Expect(k8sClient.Update(ctx, nbpolicy)).To(Succeed())
426425

427426
nbpolicy.Status.ManagedServiceList = append(nbpolicy.Status.ManagedServiceList, "default/test")
428-
nbpolicy.Status.TCPPolicyID = util.Ptr("policyid")
427+
nbpolicy.Status.TCPPolicyID = new("policyid")
429428
Expect(k8sClient.Status().Update(ctx, nbpolicy)).To(Succeed())
430429

431430
mux.HandleFunc("/api/groups", func(w http.ResponseWriter, r *http.Request) {
@@ -524,7 +523,7 @@ var _ = Describe("NBPolicy Controller", func() {
524523
Expect(k8sClient.Status().Update(ctx, nbResourceB)).To(Succeed())
525524

526525
nbpolicy.Status.ManagedServiceList = append(nbpolicy.Status.ManagedServiceList, "default/test", "default/test-b")
527-
nbpolicy.Status.TCPPolicyID = util.Ptr("policyid")
526+
nbpolicy.Status.TCPPolicyID = new("policyid")
528527
Expect(k8sClient.Status().Update(ctx, nbpolicy)).To(Succeed())
529528

530529
mux.HandleFunc("/api/groups", func(w http.ResponseWriter, r *http.Request) {
@@ -552,13 +551,13 @@ var _ = Describe("NBPolicy Controller", func() {
552551
err = json.Unmarshal(bs, &policyReq)
553552
Expect(err).NotTo(HaveOccurred())
554553
Expect(policyReq.Name).To(Equal("Test TCP"))
555-
Expect(policyReq.Description).To(Or(BeNil(), BeEquivalentTo(util.Ptr(""))))
554+
Expect(policyReq.Description).To(Or(BeNil(), BeEquivalentTo(new(""))))
556555
Expect(policyReq.Enabled).To(BeTrue())
557556
Expect(policyReq.SourcePostureChecks).To(BeNil())
558557
Expect(policyReq.Rules).To(HaveLen(1))
559558
Expect(policyReq.Rules[0].Action).To(BeEquivalentTo(api.PolicyRuleActionAccept))
560559
Expect(policyReq.Rules[0].Bidirectional).To(BeTrue())
561-
Expect(policyReq.Rules[0].Description).To(Or(BeNil(), BeEquivalentTo(util.Ptr(""))))
560+
Expect(policyReq.Rules[0].Description).To(Or(BeNil(), BeEquivalentTo(new(""))))
562561
Expect(policyReq.Rules[0].DestinationResource).To(BeNil())
563562
Expect(policyReq.Rules[0].Destinations).NotTo(BeNil())
564563
Expect(*policyReq.Rules[0].Destinations).To(HaveLen(2))
@@ -594,8 +593,8 @@ var _ = Describe("NBPolicy Controller", func() {
594593
Netbird: netbirdClient,
595594
}
596595

597-
nbpolicy.Status.TCPPolicyID = util.Ptr("policyidtcp")
598-
nbpolicy.Status.UDPPolicyID = util.Ptr("policyidudp")
596+
nbpolicy.Status.TCPPolicyID = new("policyidtcp")
597+
nbpolicy.Status.UDPPolicyID = new("policyidudp")
599598
Expect(k8sClient.Status().Update(ctx, nbpolicy)).To(Succeed())
600599

601600
Expect(k8sClient.Delete(ctx, nbpolicy)).To(Succeed())

‎internal/controller/nbresource_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ func (r *NBResourceReconciler) handleGroups(ctx context.Context, req ctrl.Reques
533533
Kind: "NBResource",
534534
Name: nbResource.Name,
535535
UID: nbResource.UID,
536-
BlockOwnerDeletion: util.Ptr(true),
536+
BlockOwnerDeletion: new(true),
537537
},
538538
},
539539
Finalizers: []string{"netbird.io/group-cleanup", "netbird.io/resource-cleanup"},
@@ -566,7 +566,7 @@ func (r *NBResourceReconciler) handleGroups(ctx context.Context, req ctrl.Reques
566566
Kind: "NBResource",
567567
Name: nbResource.Name,
568568
UID: nbResource.UID,
569-
BlockOwnerDeletion: util.Ptr(true),
569+
BlockOwnerDeletion: new(true),
570570
})
571571

572572
err = r.Client.Update(ctx, &nbGroup)

‎internal/controller/nbresource_controller_test.go‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222
"github.com/netbirdio/netbird/shared/management/http/api"
2323

2424
nbv1 "github.com/netbirdio/kubernetes-operator/api/v1"
25-
"github.com/netbirdio/kubernetes-operator/internal/util"
2625
)
2726

2827
var _ = Describe("NBResource Controller", func() {
@@ -128,7 +127,7 @@ var _ = Describe("NBResource Controller", func() {
128127
nbGroup := &nbv1.NBGroup{}
129128
Expect(k8sClient.Get(ctx, types.NamespacedName{Namespace: "default", Name: "meow"}, nbGroup)).To(Succeed())
130129
Expect(nbGroup.Labels).To(HaveKeyWithValue("dog", "bark"))
131-
nbGroup.Status.GroupID = util.Ptr("test")
130+
nbGroup.Status.GroupID = new("test")
132131
Expect(k8sClient.Status().Update(ctx, nbGroup)).To(Succeed())
133132
})
134133

@@ -180,7 +179,7 @@ var _ = Describe("NBResource Controller", func() {
180179
})
181180
When("Network Resource exists", func() {
182181
BeforeEach(func() {
183-
nbresource.Status.NetworkResourceID = util.Ptr("test")
182+
nbresource.Status.NetworkResourceID = new("test")
184183
Expect(k8sClient.Status().Update(ctx, nbresource)).To(Succeed())
185184

186185
nbGroup := &nbv1.NBGroup{
@@ -203,7 +202,7 @@ var _ = Describe("NBResource Controller", func() {
203202
}
204203
Expect(k8sClient.Create(ctx, nbGroup)).To(Succeed())
205204

206-
nbGroup.Status.GroupID = util.Ptr("test")
205+
nbGroup.Status.GroupID = new("test")
207206
Expect(k8sClient.Status().Update(ctx, nbGroup)).To(Succeed())
208207
})
209208

@@ -282,7 +281,7 @@ var _ = Describe("NBResource Controller", func() {
282281
}
283282
})
284283

285-
nbresource.Status.NetworkResourceID = util.Ptr("test")
284+
nbresource.Status.NetworkResourceID = new("test")
286285
Expect(k8sClient.Status().Update(ctx, nbresource)).To(Succeed())
287286

288287
_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
@@ -378,7 +377,7 @@ var _ = Describe("NBResource Controller", func() {
378377
nbresource.Spec.PolicyName = "test-b"
379378
Expect(k8sClient.Update(ctx, nbresource)).To(Succeed())
380379

381-
nbresource.Status.PolicyName = util.Ptr("test-a")
380+
nbresource.Status.PolicyName = new("test-a")
382381
Expect(k8sClient.Status().Update(ctx, nbresource)).To(Succeed())
383382

384383
_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
@@ -406,7 +405,7 @@ var _ = Describe("NBResource Controller", func() {
406405
nbresource.Spec.PolicyName = ""
407406
Expect(k8sClient.Update(ctx, nbresource)).To(Succeed())
408407

409-
nbresource.Status.PolicyName = util.Ptr("test-a")
408+
nbresource.Status.PolicyName = new("test-a")
410409
Expect(k8sClient.Status().Update(ctx, nbresource)).To(Succeed())
411410

412411
_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
@@ -705,7 +704,7 @@ var _ = Describe("NBResource Controller", func() {
705704
nbresource.Spec.PolicyName = "test-b,test-c"
706705
Expect(k8sClient.Update(ctx, nbresource)).To(Succeed())
707706

708-
nbresource.Status.PolicyName = util.Ptr("test-a,test-b")
707+
nbresource.Status.PolicyName = new("test-a,test-b")
709708
Expect(k8sClient.Status().Update(ctx, nbresource)).To(Succeed())
710709

711710
_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
@@ -732,7 +731,7 @@ var _ = Describe("NBResource Controller", func() {
732731
nbresource.Spec.PolicyName = ""
733732
Expect(k8sClient.Update(ctx, nbresource)).To(Succeed())
734733

735-
nbresource.Status.PolicyName = util.Ptr("test-b,test-c")
734+
nbresource.Status.PolicyName = new("test-b,test-c")
736735
Expect(k8sClient.Status().Update(ctx, nbresource)).To(Succeed())
737736

738737
_, err := controllerReconciler.Reconcile(ctx, reconcile.Request{
@@ -870,8 +869,8 @@ var _ = Describe("NBResource Controller", func() {
870869
nbresource.Spec.Groups = []string{"meow", "meowdelete"}
871870
Expect(k8sClient.Update(ctx, nbresource)).To(Succeed())
872871
nbresource.Status.Groups = []string{"test", "testdelete"}
873-
nbresource.Status.PolicyName = util.Ptr("test")
874-
nbresource.Status.NetworkResourceID = util.Ptr("test")
872+
nbresource.Status.PolicyName = new("test")
873+
nbresource.Status.NetworkResourceID = new("test")
875874
Expect(k8sClient.Status().Update(ctx, nbresource)).To(Succeed())
876875

877876
nbPolicy := &nbv1.NBPolicy{

‎internal/controller/nbroutingpeer_controller.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func (r *NBRoutingPeerReconciler) handleDeployment(ctx context.Context, req ctrl
147147
Kind: "NBRoutingPeer",
148148
Name: nbrp.Name,
149149
UID: nbrp.UID,
150-
BlockOwnerDeletion: util.Ptr(true),
150+
BlockOwnerDeletion: new(true),
151151
},
152152
},
153153
Labels: labels,
@@ -215,7 +215,7 @@ func (r *NBRoutingPeerReconciler) handleDeployment(ctx context.Context, req ctrl
215215
Kind: "NBRoutingPeer",
216216
Name: nbrp.Name,
217217
UID: nbrp.UID,
218-
BlockOwnerDeletion: util.Ptr(true),
218+
BlockOwnerDeletion: new(true),
219219
},
220220
}
221221
updatedDeployment.ObjectMeta.Labels = labels
@@ -345,7 +345,7 @@ func (r *NBRoutingPeerReconciler) handleSetupKey(ctx context.Context, req ctrl.R
345345
// Create new setup key with group Status.GroupID
346346
setupKey, err := r.Netbird.SetupKeys.Create(ctx, api.CreateSetupKeyRequest{
347347
AutoGroups: []string{*nbGroup.Status.GroupID},
348-
Ephemeral: util.Ptr(true),
348+
Ephemeral: new(true),
349349
Name: networkName,
350350
Type: "reusable",
351351
})
@@ -368,7 +368,7 @@ func (r *NBRoutingPeerReconciler) handleSetupKey(ctx context.Context, req ctrl.R
368368
Kind: "NBRoutingPeer",
369369
Name: nbrp.Name,
370370
UID: nbrp.UID,
371-
BlockOwnerDeletion: util.Ptr(true),
371+
BlockOwnerDeletion: new(true),
372372
},
373373
},
374374
Labels: r.DefaultLabels,
@@ -478,7 +478,7 @@ func (r *NBRoutingPeerReconciler) handleGroup(ctx context.Context, req ctrl.Requ
478478
Kind: "NBRoutingPeer",
479479
Name: nbrp.Name,
480480
UID: nbrp.UID,
481-
BlockOwnerDeletion: util.Ptr(true),
481+
BlockOwnerDeletion: new(true),
482482
},
483483
},
484484
Finalizers: []string{"netbird.io/group-cleanup", "netbird.io/routing-peer-cleanup"},

0 commit comments

Comments
 (0)