@@ -1792,7 +1792,7 @@ type promClientControllerTestSetup struct {
17921792 namespace string
17931793}
17941794
1795- func setupPromClientControllerTest (objects []runtime.Object , prometheusConfig * api.Prometheus ) * promClientControllerTestSetup {
1795+ func setupPromClientControllerTest (ctx context. Context , objects []runtime.Object , prometheusConfig * api.Prometheus ) * promClientControllerTestSetup {
17961796 fakeClient := fakeclientset .NewSimpleClientset (objects ... )
17971797
17981798 namespace := "default"
@@ -1814,16 +1814,14 @@ func setupPromClientControllerTest(objects []runtime.Object, prometheusConfig *a
18141814 namespacedInformerFactory .Core ().V1 ().Secrets ().Informer ().AddEventHandler (ctrl .eventHandler ())
18151815 }
18161816
1817- stopCh := make (chan struct {})
1818- namespacedInformerFactory .Start (stopCh )
1819- namespacedInformerFactory .WaitForCacheSync (stopCh )
1817+ namespacedInformerFactory .Start (ctx .Done ())
1818+ namespacedInformerFactory .WaitForCacheSync (ctx .Done ())
18201819
18211820 return & promClientControllerTestSetup {
18221821 fakeClient : fakeClient ,
18231822 namespacedInformerFactory : namespacedInformerFactory ,
18241823 metricsProviders : metricsProviders ,
18251824 ctrl : ctrl ,
1826- stopCh : stopCh ,
18271825 namespace : namespace ,
18281826 }
18291827}
@@ -1895,8 +1893,9 @@ func TestPromClientControllerSync_InvalidConfig(t *testing.T) {
18951893
18961894 for _ , tc := range testCases {
18971895 t .Run (tc .name , func (t * testing.T ) {
1898- setup := setupPromClientControllerTest (tc .objects , tc .prometheusConfig )
1899- defer close (setup .stopCh )
1896+ ctx , cancel := context .WithCancel (context .TODO ())
1897+ defer cancel ()
1898+ setup := setupPromClientControllerTest (ctx , tc .objects , tc .prometheusConfig )
19001899
19011900 // Call sync
19021901 err := setup .ctrl .sync ()
@@ -1970,8 +1969,9 @@ func TestPromClientControllerSync_ClientCreation(t *testing.T) {
19701969
19711970 for _ , tc := range testCases {
19721971 t .Run (tc .name , func (t * testing.T ) {
1973- setup := setupPromClientControllerTest (tc .objects , newPrometheusConfig ())
1974- defer close (setup .stopCh )
1972+ ctx , cancel := context .WithCancel (context .TODO ())
1973+ defer cancel ()
1974+ setup := setupPromClientControllerTest (ctx , tc .objects , newPrometheusConfig ())
19751975
19761976 // Set additional test-specific fields
19771977 setup .ctrl .currentPrometheusAuthToken = tc .currentAuthToken
@@ -2050,8 +2050,7 @@ func TestPromClientControllerSync_EventHandler(t *testing.T) {
20502050 prometheusConfig := newPrometheusConfig ()
20512051 secretName := prometheusConfig .AuthToken .SecretReference .Name
20522052
2053- setup := setupPromClientControllerTest (nil , prometheusConfig )
2054- defer close (setup .stopCh )
2053+ setup := setupPromClientControllerTest (ctx , nil , prometheusConfig )
20552054
20562055 // Track created clients to verify different instances
20572056 var createdClients []promapi.Client
0 commit comments