Skip to content

Commit cec6905

Browse files
committed
fix test
1 parent 3af96af commit cec6905

File tree

1 file changed

+49
-42
lines changed

1 file changed

+49
-42
lines changed

internal/manager/controllers.go

Lines changed: 49 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -179,16 +179,6 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
179179
Provider: pro,
180180
ICGVK: icgvk,
181181
},
182-
// APISIX v2 Controllers - always register these as they are core to the controller
183-
&controller.ApisixGlobalRuleReconciler{
184-
Client: mgr.GetClient(),
185-
Scheme: mgr.GetScheme(),
186-
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixGlobalRule"),
187-
Provider: pro,
188-
Updater: updater,
189-
Readier: readier,
190-
ICGVK: icgvk,
191-
},
192182
&controller.ApisixRouteReconciler{
193183
Client: mgr.GetClient(),
194184
Scheme: mgr.GetScheme(),
@@ -198,45 +188,62 @@ func setupControllers(ctx context.Context, mgr manager.Manager, pro provider.Pro
198188
Readier: readier,
199189
ICGVK: icgvk,
200190
},
201-
&controller.ApisixConsumerReconciler{
202-
Client: mgr.GetClient(),
203-
Scheme: mgr.GetScheme(),
204-
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixConsumer"),
205-
Provider: pro,
206-
Updater: updater,
207-
Readier: readier,
208-
ICGVK: icgvk,
209-
},
210-
&controller.ApisixPluginConfigReconciler{
211-
Client: mgr.GetClient(),
212-
Scheme: mgr.GetScheme(),
213-
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixPluginConfig"),
214-
Updater: updater,
215-
ICGVK: icgvk,
216-
},
217-
&controller.ApisixTlsReconciler{
218-
Client: mgr.GetClient(),
219-
Scheme: mgr.GetScheme(),
220-
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixTls"),
221-
Provider: pro,
222-
Updater: updater,
223-
Readier: readier,
224-
ICGVK: icgvk,
225-
},
226-
&controller.ApisixUpstreamReconciler{
227-
Client: mgr.GetClient(),
228-
Scheme: mgr.GetScheme(),
229-
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixUpstream"),
230-
Updater: updater,
231-
ICGVK: icgvk,
232-
},
191+
/*
192+
&controller.ApisixGlobalRuleReconciler{
193+
Client: mgr.GetClient(),
194+
Scheme: mgr.GetScheme(),
195+
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixGlobalRule"),
196+
Provider: pro,
197+
Updater: updater,
198+
Readier: readier,
199+
ICGVK: icgvk,
200+
},
201+
202+
&controller.ApisixConsumerReconciler{
203+
Client: mgr.GetClient(),
204+
Scheme: mgr.GetScheme(),
205+
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixConsumer"),
206+
Provider: pro,
207+
Updater: updater,
208+
Readier: readier,
209+
ICGVK: icgvk,
210+
},
211+
&controller.ApisixPluginConfigReconciler{
212+
Client: mgr.GetClient(),
213+
Scheme: mgr.GetScheme(),
214+
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixPluginConfig"),
215+
Updater: updater,
216+
ICGVK: icgvk,
217+
},
218+
&controller.ApisixTlsReconciler{
219+
Client: mgr.GetClient(),
220+
Scheme: mgr.GetScheme(),
221+
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixTls"),
222+
Provider: pro,
223+
Updater: updater,
224+
Readier: readier,
225+
ICGVK: icgvk,
226+
},
227+
&controller.ApisixUpstreamReconciler{
228+
Client: mgr.GetClient(),
229+
Scheme: mgr.GetScheme(),
230+
Log: ctrl.LoggerFrom(ctx).WithName("controllers").WithName("ApisixUpstream"),
231+
Updater: updater,
232+
ICGVK: icgvk,
233+
},
234+
*/
233235
}...)
234236

235237
setupLog.Info("Controllers setup completed", "total_controllers", len(controllers))
236238
return controllers, nil
237239
}
238240

241+
var skip = true
242+
239243
func registerReadinessGVK(mgr manager.Manager, readier readiness.ReadinessManager) {
244+
if skip {
245+
return
246+
}
240247
c := mgr.GetClient()
241248
log := ctrl.LoggerFrom(context.Background()).WithName("readiness")
242249

0 commit comments

Comments
 (0)