Skip to content

Commit 7bb065a

Browse files
committed
call init method before registering custom resource event-source
1 parent f917aaa commit 7bb065a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

operator-framework/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,12 @@ private <R extends CustomResource> void registerController(ResourceController<R>
6565

6666
customResourceClients.put(resClass, (CustomResourceOperationsImpl) client);
6767

68+
controller.init(eventSourceManager);
6869
CustomResourceEventSource customResourceEventSource
6970
= createCustomResourceEventSource(client, customResourceCache, watchAllNamespaces, targetNamespaces,
7071
defaultEventHandler);
71-
7272
eventSourceManager.registerCustomResourceEventSource(customResourceEventSource);
73-
controller.init(eventSourceManager);
73+
7474

7575
log.info("Registered Controller: '{}' for CRD: '{}' for namespaces: {}", controller.getClass().getSimpleName(),
7676
resClass, targetNamespaces.length == 0 ? "[all/client namespace]" : Arrays.toString(targetNamespaces));

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33

44
import io.fabric8.kubernetes.client.CustomResource;
5-
import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
6-
import io.javaoperatorsdk.operator.processing.event.*;
5+
import io.javaoperatorsdk.operator.processing.event.DefaultEventSourceManager;
6+
import io.javaoperatorsdk.operator.processing.event.Event;
7+
import io.javaoperatorsdk.operator.processing.event.EventHandler;
78
import org.slf4j.Logger;
89
import org.slf4j.LoggerFactory;
910

10-
import java.time.LocalDateTime;
1111
import java.util.HashSet;
1212
import java.util.Optional;
1313
import java.util.Set;
@@ -16,7 +16,8 @@
1616
import java.util.concurrent.locks.ReentrantLock;
1717

1818
import static io.javaoperatorsdk.operator.EventListUtils.containsCustomResourceDeletedEvent;
19-
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.*;
19+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getUID;
20+
import static io.javaoperatorsdk.operator.processing.KubernetesResourceUtils.getVersion;
2021

2122
/**
2223
* Event handler that makes sure that events are processed in a "single threaded" way per resource UID, while buffering
@@ -108,7 +109,6 @@ void eventProcessingFinished(ExecutionScope executionScope, PostExecutionControl
108109
*/
109110
private void cacheUpdatedResourceIfChanged(ExecutionScope executionScope, PostExecutionControl postExecutionControl) {
110111
if (postExecutionControl.customResourceUpdatedDuringExecution()) {
111-
112112
CustomResource originalCustomResource = executionScope.getCustomResource();
113113
CustomResource customResourceAfterExecution = postExecutionControl.getUpdatedCustomResource().get();
114114
CustomResource cachedVersion = this.customResourceCache.getLatestResource(getUID(customResourceAfterExecution)).get();

0 commit comments

Comments
 (0)