39
39
var ctx context.Context
40
40
var fakeClock * clock.FakeClock
41
41
var controller * events.Controller [* test.CustomObject ]
42
+ var environment envtest.Environment
42
43
var kubeClient client.Client
43
44
44
45
func Test (t * testing.T ) {
@@ -51,13 +52,17 @@ var _ = BeforeSuite(func() {
51
52
ctx = log .IntoContext (context .Background (), ginkgo .GinkgoLogr )
52
53
53
54
fakeClock = clock .NewFakeClock (time .Now ())
54
- environment : = envtest.Environment {Scheme : scheme .Scheme }
55
+ environment = envtest.Environment {Scheme : scheme .Scheme }
55
56
_ = lo .Must (environment .Start ())
56
57
kubeClient = lo .Must (client .New (environment .Config , client.Options {Scheme : scheme .Scheme }))
57
58
58
59
controller = events .NewController [* test.CustomObject ](ctx , kubeClient , fakeClock , kubernetes .NewForConfigOrDie (environment .Config ))
59
60
})
60
61
62
+ var _ = AfterSuite (func () {
63
+ environment .Stop ()
64
+ })
65
+
61
66
var _ = Describe ("Controller" , func () {
62
67
BeforeEach (func () {
63
68
controller .EventCount .Reset ()
@@ -74,7 +79,7 @@ var _ = Describe("Controller", func() {
74
79
Expect (GetMetric ("operator_customobject_event_total" , conditionLabels (fmt .Sprintf ("Test-type-%d" , i ), fmt .Sprintf ("Test-reason-%d" , i )))).To (BeNil ())
75
80
76
81
// reconcile on the event
77
- _ , err := singleton .AsReconciler (controller ) .Reconcile (ctx , reconcile.Request {NamespacedName : client . ObjectKeyFromObject ( events [ i ]) })
82
+ _ , err := singleton .AsChannelObjectReconciler (controller . EventWatch . ResultChan (), controller ) .Reconcile (ctx , reconcile.Request {})
78
83
Expect (err ).ToNot (HaveOccurred ())
79
84
80
85
// expect an emitted metric to for the event
@@ -91,7 +96,7 @@ var _ = Describe("Controller", func() {
91
96
Expect (GetMetric ("operator_ustomobject_event_total" , conditionLabels (corev1 .EventTypeNormal , "reason" ))).To (BeNil ())
92
97
93
98
// reconcile on the event
94
- _ , err := singleton .AsReconciler ( controller ).Reconcile (ctx , reconcile.Request {NamespacedName : client .ObjectKeyFromObject (event )})
99
+ _ , err := singleton .AsChannelObjectReconciler ( controller . EventWatch . ResultChan (), controller ).Reconcile (ctx , reconcile.Request {NamespacedName : client .ObjectKeyFromObject (event )})
95
100
Expect (err ).ToNot (HaveOccurred ())
96
101
97
102
// expect not have an emitted metric to for the event
@@ -102,7 +107,7 @@ var _ = Describe("Controller", func() {
102
107
ExpectApplied (ctx , kubeClient , event )
103
108
104
109
// reconcile on the event
105
- _ , err = singleton .AsReconciler ( controller ).Reconcile (ctx , reconcile.Request {NamespacedName : client .ObjectKeyFromObject (event )})
110
+ _ , err = singleton .AsChannelObjectReconciler ( controller . EventWatch . ResultChan (), controller ).Reconcile (ctx , reconcile.Request {NamespacedName : client .ObjectKeyFromObject (event )})
106
111
Expect (err ).ToNot (HaveOccurred ())
107
112
108
113
// expect an emitted metric to for the event
0 commit comments