Skip to content

Commit 40352d5

Browse files
committed
revert fake fix
1 parent 3990f2c commit 40352d5

1 file changed

Lines changed: 7 additions & 4 deletions

File tree

pkg/konnector/controllers/cluster/serviceexport/status/status_controller.go

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func (c *controller) enqueueProvider(logger klog.Logger, obj any) {
185185
// Try to map the provider name back to the consumer name,
186186
// but only to check if we "own" the object; we will actually
187187
// enqueue the provider key after all.
188-
consumerKey, err := c.reconciler.isolationStrategy.ToConsumerKey(types.NamespacedName{
188+
consumerKey, err := c.isolationStrategy.ToConsumerKey(types.NamespacedName{
189189
Namespace: ns,
190190
Name: name,
191191
})
@@ -216,7 +216,7 @@ func (c *controller) enqueueConsumer(logger klog.Logger, obj any) {
216216
return
217217
}
218218

219-
providerKey, err := c.reconciler.isolationStrategy.ToProviderKey(types.NamespacedName{
219+
providerKey, err := c.isolationStrategy.ToProviderKey(types.NamespacedName{
220220
Namespace: ns,
221221
Name: name,
222222
})
@@ -250,7 +250,10 @@ func (c *controller) enqueueServiceNamespace(logger klog.Logger, obj any) {
250250
return // not for us
251251
}
252252

253-
strategy := c.reconciler.isolationStrategy.(*isolation.ServiceNamespacedStrategy)
253+
strategy, ok := c.isolationStrategy.(*isolation.ServiceNamespacedStrategy)
254+
if !ok { // should not happen... but...
255+
return
256+
}
254257
nsOnProviderCluster, err := strategy.ProviderNamespace(name)
255258
if err != nil {
256259
runtime.HandleError(err)
@@ -289,7 +292,7 @@ func (c *controller) Start(ctx context.Context, numThreads int) {
289292
// APIServiceNamespaces are only of interest when syncing namespaced
290293
// objects, and since these event handlers need the appropriate isolation
291294
// strategy, we only start them when necessary.
292-
if _, ok := c.reconciler.isolationStrategy.(*isolation.ServiceNamespacedStrategy); ok {
295+
if _, ok := c.isolationStrategy.(*isolation.ServiceNamespacedStrategy); ok {
293296
c.serviceNamespaceInformer.Informer().AddDynamicEventHandler(ctx, controllerName, cache.ResourceEventHandlerFuncs{
294297
AddFunc: func(obj any) {
295298
c.enqueueServiceNamespace(logger, obj)

0 commit comments

Comments
 (0)