Skip to content

Commit 1cc425f

Browse files
committed
fix: startup bug, when CRs already present on cluster + renaming
1 parent 86245ca commit 1cc425f

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,19 @@ public void start() {
7575
try {
7676
if (ControllerConfiguration.allNamespacesWatched(targetNamespaces)) {
7777
var informer = client.inAnyNamespace()
78-
.withLabels(parseSimpleLabelSelector(labelSelector)).inform(this);
78+
.withLabels(parseSimpleLabelSelector(labelSelector)).runnableInformer(0);
79+
informer.addEventHandler(this);
7980
sharedIndexInformers.put(ANY_NAMESPACE_MAP_KEY, informer);
8081
log.debug("Registered {} -> {} for any namespace", controller, informer);
82+
informer.run();
8183
} else {
8284
targetNamespaces.forEach(
8385
ns -> {
8486
var informer = client.inNamespace(ns)
85-
.withLabels(parseSimpleLabelSelector(labelSelector)).inform(this);
87+
.withLabels(parseSimpleLabelSelector(labelSelector)).runnableInformer(0);
88+
informer.addEventHandler(this);
8689
sharedIndexInformers.put(ns, informer);
90+
informer.run();
8791
log.debug("Registered {} -> {} for namespace: {}", controller, informer,
8892
ns);
8993
});

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public String getNamespace() {
106106
}
107107

108108
@SuppressWarnings({"rawtypes"})
109-
public List<Reconciler> getControllers() {
109+
public List<Reconciler> getReconcilers() {
110110
return operator.getControllers().stream()
111111
.map(Controller::getReconciler)
112112
.collect(Collectors.toUnmodifiableList());

operator-framework/src/test/java/io/javaoperatorsdk/operator/support/TestUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,6 @@ public static void waitXms(int x) {
5858
}
5959

6060
public static int getNumberOfExecutions(OperatorExtension extension) {
61-
return ((TestExecutionInfoProvider) extension.getControllers().get(0)).getNumberOfExecutions();
61+
return ((TestExecutionInfoProvider) extension.getReconcilers().get(0)).getNumberOfExecutions();
6262
}
6363
}

0 commit comments

Comments
 (0)