@@ -189,12 +189,12 @@ func TestIntegrationCVO_initializeAndUpgrade(t *testing.T) {
189
189
t .Fatalf ("incorrectly initialized options: %v" , err )
190
190
}
191
191
192
- cvif , cif := options .prepareConfigInformerFactories (cb )
193
- featureset , gates , err := options .processInitialFeatureGate (context .Background (), cvif )
192
+ clusterVersionConfigInformerFactory , configInformerFactory := options .prepareConfigInformerFactories (cb )
193
+ featureset , gates , err := options .processInitialFeatureGate (context .Background (), configInformerFactory )
194
194
if err != nil {
195
195
t .Fatal (err )
196
196
}
197
- controllers , err := options .NewControllerContext (cb , featureset , gates , cvif , cif )
197
+ controllers , err := options .NewControllerContext (cb , featureset , gates , clusterVersionConfigInformerFactory , configInformerFactory )
198
198
if err != nil {
199
199
t .Fatal (err )
200
200
}
@@ -330,12 +330,12 @@ func TestIntegrationCVO_gracefulStepDown(t *testing.T) {
330
330
t .Fatalf ("incorrectly initialized options: %v" , err )
331
331
}
332
332
333
- cvif , cif := options .prepareConfigInformerFactories (cb )
334
- featureset , gates , err := options .processInitialFeatureGate (context .Background (), cvif )
333
+ clusterVersionConfigInformerFactory , configInformerFactory := options .prepareConfigInformerFactories (cb )
334
+ featureset , gates , err := options .processInitialFeatureGate (context .Background (), configInformerFactory )
335
335
if err != nil {
336
336
t .Fatal (err )
337
337
}
338
- controllers , err := options .NewControllerContext (cb , featureset , gates , cvif , cif )
338
+ controllers , err := options .NewControllerContext (cb , featureset , gates , clusterVersionConfigInformerFactory , configInformerFactory )
339
339
if err != nil {
340
340
t .Fatal (err )
341
341
}
@@ -533,12 +533,12 @@ metadata:
533
533
t .Fatalf ("incorrectly initialized options: %v" , err )
534
534
}
535
535
536
- cvif , cif := options .prepareConfigInformerFactories (cb )
537
- featureset , gates , err := options .processInitialFeatureGate (context .Background (), cvif )
536
+ clusterVersionConfigInformerFactory , configInformerFactory := options .prepareConfigInformerFactories (cb )
537
+ featureset , gates , err := options .processInitialFeatureGate (context .Background (), configInformerFactory )
538
538
if err != nil {
539
539
t .Fatal (err )
540
540
}
541
- controllers , err := options .NewControllerContext (cb , featureset , gates , cvif , cif )
541
+ controllers , err := options .NewControllerContext (cb , featureset , gates , clusterVersionConfigInformerFactory , configInformerFactory )
542
542
if err != nil {
543
543
t .Fatal (err )
544
544
}
0 commit comments