Skip to content

Commit 2ace093

Browse files
author
Phillip Wittrock
authored
Merge pull request #3 from pwittrock/master
Update test.sh to run go vet and go fmt
2 parents 952576b + 6686bf4 commit 2ace093

File tree

4 files changed

+35
-31
lines changed

4 files changed

+35
-31
lines changed

‎example/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func main() {
3838
logf.SetLogger(logf.ZapLogger(false))
3939

4040
// Setup a ControllerManager
41-
manager, err := controller.NewControllerManager(ctrl.ControllerManagerArgs{})
41+
manager, err := controller.NewControllerManager(controller.ControllerManagerArgs{})
4242
if err != nil {
4343
log.Fatal(err)
4444
}

‎pkg/controller/eventhandler/eventhandler_test.go

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ var _ = Describe("Eventhandler", func() {
3737
var pod *corev1.Pod
3838
t := true
3939
BeforeEach(func() {
40-
q = controllertest.Queue{workqueue.New()}
40+
q = controllertest.Queue{Interface: workqueue.New()}
4141
instance = eventhandler.EnqueueHandler{}
4242
pod = &corev1.Pod{
4343
ObjectMeta: metav1.ObjectMeta{Namespace: "biz", Name: "baz"},
@@ -196,10 +196,10 @@ var _ = Describe("Eventhandler", func() {
196196
Expect(a.Object).To(Equal(pod))
197197
req = []reconcile.ReconcileRequest{
198198
{
199-
types.NamespacedName{"foo", "bar"},
199+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"},
200200
},
201201
{
202-
types.NamespacedName{"biz", "baz"},
202+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"},
203203
},
204204
}
205205
return req
@@ -215,11 +215,11 @@ var _ = Describe("Eventhandler", func() {
215215

216216
i, _ := q.Get()
217217
Expect(i).To(Equal(reconcile.ReconcileRequest{
218-
types.NamespacedName{"foo", "bar"}}))
218+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}}))
219219

220220
i, _ = q.Get()
221221
Expect(i).To(Equal(reconcile.ReconcileRequest{
222-
types.NamespacedName{"biz", "baz"}}))
222+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}}))
223223
})
224224

225225
It("should enqueue a ReconcileRequest with the function applied to the DeleteEvent.", func() {
@@ -231,10 +231,10 @@ var _ = Describe("Eventhandler", func() {
231231
Expect(a.Object).To(Equal(pod))
232232
req = []reconcile.ReconcileRequest{
233233
{
234-
types.NamespacedName{"foo", "bar"},
234+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"},
235235
},
236236
{
237-
types.NamespacedName{"biz", "baz"},
237+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"},
238238
},
239239
}
240240
return req
@@ -250,11 +250,11 @@ var _ = Describe("Eventhandler", func() {
250250

251251
i, _ := q.Get()
252252
Expect(i).To(Equal(reconcile.ReconcileRequest{
253-
types.NamespacedName{"foo", "bar"}}))
253+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}}))
254254

255255
i, _ = q.Get()
256256
Expect(i).To(Equal(reconcile.ReconcileRequest{
257-
types.NamespacedName{"biz", "baz"}}))
257+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}}))
258258
})
259259

260260
It("should enqueue a ReconcileRequest with the function applied to both objects in the UpdateEvent.",
@@ -269,10 +269,10 @@ var _ = Describe("Eventhandler", func() {
269269
defer GinkgoRecover()
270270
req = []reconcile.ReconcileRequest{
271271
{
272-
types.NamespacedName{"foo", a.Meta.GetName() + "-bar"},
272+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: a.Meta.GetName() + "-bar"},
273273
},
274274
{
275-
types.NamespacedName{"biz", a.Meta.GetName() + "-baz"},
275+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: a.Meta.GetName() + "-baz"},
276276
},
277277
}
278278
return req
@@ -290,19 +290,19 @@ var _ = Describe("Eventhandler", func() {
290290

291291
i, _ := q.Get()
292292
Expect(i).To(Equal(reconcile.ReconcileRequest{
293-
types.NamespacedName{"foo", "baz-bar"}}))
293+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: "baz-bar"}}))
294294

295295
i, _ = q.Get()
296296
Expect(i).To(Equal(reconcile.ReconcileRequest{
297-
types.NamespacedName{"biz", "baz-baz"}}))
297+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz-baz"}}))
298298

299299
i, _ = q.Get()
300300
Expect(i).To(Equal(reconcile.ReconcileRequest{
301-
types.NamespacedName{"foo", "baz2-bar"}}))
301+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: "baz2-bar"}}))
302302

303303
i, _ = q.Get()
304304
Expect(i).To(Equal(reconcile.ReconcileRequest{
305-
types.NamespacedName{"biz", "baz2-baz"}}))
305+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz2-baz"}}))
306306
})
307307

308308
It("should enqueue a ReconcileRequest with the function applied to the GenericEvent.", func() {
@@ -314,10 +314,10 @@ var _ = Describe("Eventhandler", func() {
314314
Expect(a.Object).To(Equal(pod))
315315
req = []reconcile.ReconcileRequest{
316316
{
317-
types.NamespacedName{"foo", "bar"},
317+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"},
318318
},
319319
{
320-
types.NamespacedName{"biz", "baz"},
320+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"},
321321
},
322322
}
323323
return req
@@ -333,11 +333,11 @@ var _ = Describe("Eventhandler", func() {
333333

334334
i, _ := q.Get()
335335
Expect(i).To(Equal(reconcile.ReconcileRequest{
336-
types.NamespacedName{"foo", "bar"}}))
336+
NamespacedName: types.NamespacedName{Namespace: "foo", Name: "bar"}}))
337337

338338
i, _ = q.Get()
339339
Expect(i).To(Equal(reconcile.ReconcileRequest{
340-
types.NamespacedName{"biz", "baz"}}))
340+
NamespacedName: types.NamespacedName{Namespace: "biz", Name: "baz"}}))
341341
})
342342
})
343343

@@ -364,7 +364,7 @@ var _ = Describe("Eventhandler", func() {
364364

365365
i, _ := q.Get()
366366
Expect(i).To(Equal(reconcile.ReconcileRequest{
367-
types.NamespacedName{pod.GetNamespace(), "foo-parent"}}))
367+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo-parent"}}))
368368
})
369369

370370
It("should enqueue a ReconcileRequest with the Owner of the object in the DeleteEvent.", func() {
@@ -389,7 +389,7 @@ var _ = Describe("Eventhandler", func() {
389389

390390
i, _ := q.Get()
391391
Expect(i).To(Equal(reconcile.ReconcileRequest{
392-
types.NamespacedName{pod.GetNamespace(), "foo-parent"}}))
392+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo-parent"}}))
393393
})
394394

395395
It("should enqueue a ReconcileRequest with the Owners of both objects in the UpdateEvent.", func() {
@@ -427,11 +427,11 @@ var _ = Describe("Eventhandler", func() {
427427

428428
i, _ := q.Get()
429429
Expect(i).To(Equal(reconcile.ReconcileRequest{
430-
types.NamespacedName{pod.GetNamespace(), "foo1-parent"}}))
430+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo1-parent"}}))
431431

432432
i, _ = q.Get()
433433
Expect(i).To(Equal(reconcile.ReconcileRequest{
434-
types.NamespacedName{newPod.GetNamespace(), "foo2-parent"}}))
434+
NamespacedName: types.NamespacedName{Namespace: newPod.GetNamespace(), Name: "foo2-parent"}}))
435435
})
436436

437437
It("should enqueue a ReconcileRequest with the Owner of the object in the GenericEvent.", func() {
@@ -456,7 +456,7 @@ var _ = Describe("Eventhandler", func() {
456456

457457
i, _ := q.Get()
458458
Expect(i).To(Equal(reconcile.ReconcileRequest{
459-
types.NamespacedName{pod.GetNamespace(), "foo-parent"}}))
459+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo-parent"}}))
460460
})
461461

462462
It("should not enqueue a ReconcileRequest if there are no owners matching Group and Kind.", func() {
@@ -507,7 +507,7 @@ var _ = Describe("Eventhandler", func() {
507507

508508
i, _ := q.Get()
509509
Expect(i).To(Equal(reconcile.ReconcileRequest{
510-
types.NamespacedName{pod.GetNamespace(), "foo-parent"}}))
510+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo-parent"}}))
511511
})
512512

513513
It("should not enqueue a ReconcileRequest if there are no owners.", func() {
@@ -568,7 +568,7 @@ var _ = Describe("Eventhandler", func() {
568568
Expect(q.Len()).To(Equal(1))
569569
i, _ := q.Get()
570570
Expect(i).To(Equal(reconcile.ReconcileRequest{
571-
types.NamespacedName{pod.GetNamespace(), "foo2-parent"}}))
571+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo2-parent"}}))
572572
})
573573

574574
It("should not enqueue ReconcileRequests if there are no Controller owners.", func() {
@@ -649,13 +649,13 @@ var _ = Describe("Eventhandler", func() {
649649

650650
i, _ := q.Get()
651651
Expect(i).To(Equal(reconcile.ReconcileRequest{
652-
types.NamespacedName{pod.GetNamespace(), "foo1-parent"}}))
652+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo1-parent"}}))
653653
i, _ = q.Get()
654654
Expect(i).To(Equal(reconcile.ReconcileRequest{
655-
types.NamespacedName{pod.GetNamespace(), "foo2-parent"}}))
655+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo2-parent"}}))
656656
i, _ = q.Get()
657657
Expect(i).To(Equal(reconcile.ReconcileRequest{
658-
types.NamespacedName{pod.GetNamespace(), "foo3-parent"}}))
658+
NamespacedName: types.NamespacedName{Namespace: pod.GetNamespace(), Name: "foo3-parent"}}))
659659
})
660660
})
661661

‎pkg/controller/reconcile/example_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func ExampleReconcileFunc() {
3131
return reconcile.ReconcileResult{}, nil
3232
})
3333

34-
r.Reconcile(reconcile.ReconcileRequest{types.NamespacedName{Namespace: "default", Name: "test"}})
34+
r.Reconcile(reconcile.ReconcileRequest{NamespacedName: types.NamespacedName{Namespace: "default", Name: "test"}})
3535

3636
// Output: Name: test, Namespace: default
3737
}

‎test.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,3 +103,7 @@ setup_envs
103103

104104
go test github.com/kubernetes-sigs/controller-runtime/pkg/...
105105
go install github.com/kubernetes-sigs/controller-runtime/example
106+
107+
go vet ./pkg/...
108+
109+
# golint -set_exit_status ./pkg/...

0 commit comments

Comments
 (0)