Skip to content

Commit 42120dd

Browse files
committed
fixes
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent ad232e4 commit 42120dd

File tree

3 files changed

+21
-3
lines changed

3 files changed

+21
-3
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/CRUDKubernetesDependentResource.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,8 @@ public abstract class CRUDKubernetesDependentResource<R extends HasMetadata, P e
2222
public CRUDKubernetesDependentResource(Class<R> resourceType) {
2323
super(resourceType);
2424
}
25+
26+
public CRUDKubernetesDependentResource(Class<R> resourceType, String name) {
27+
super(resourceType, name);
28+
}
2529
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/AbstractWorkflowExecutor.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@ protected <R> void registerOrDeregisterEventSourceBasedOnActivation(
135135
if (dependentResourceNode.getActivationCondition().isPresent()) {
136136
final var dr = dependentResourceNode.getDependentResource();
137137
final var eventSourceRetriever = context.eventSourceRetriever();
138+
var eventSource =
139+
dr.eventSource(eventSourceRetriever.eventSourceContextForDynamicRegistration());
138140
if (activationConditionMet) {
139-
var eventSource =
140-
dr.eventSource(eventSourceRetriever.eventSourceContextForDynamicRegistration());
141141
var es = eventSource.orElseThrow();
142142
eventSourceRetriever.dynamicallyRegisterEventSource(es);
143143
} else {
144-
eventSourceRetriever.dynamicallyDeRegisterEventSource(dr.name());
144+
eventSourceRetriever.dynamicallyDeRegisterEventSource(eventSource.orElseThrow().name());
145145
}
146146
}
147147
}

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/AbstractWorkflowExecutorTest.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,24 @@
33
import java.util.ArrayList;
44
import java.util.Collections;
55
import java.util.List;
6+
import java.util.Optional;
67

78
import io.fabric8.kubernetes.api.model.ConfigMap;
89
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
910
import io.javaoperatorsdk.operator.api.reconciler.Context;
11+
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
1012
import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
1113
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
1214
import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
1315
import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
1416
import io.javaoperatorsdk.operator.processing.dependent.Creator;
1517
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
18+
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1619
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
1720

21+
import static org.mockito.Mockito.mock;
22+
import static org.mockito.Mockito.when;
23+
1824
public class AbstractWorkflowExecutorTest {
1925
public static final String VALUE = "value";
2026

@@ -52,6 +58,14 @@ public ReconcileResult<ConfigMap> reconcile(TestCustomResource primary,
5258
.resourceCreated(new ConfigMapBuilder().addToBinaryData("key", VALUE).build());
5359
}
5460

61+
@Override
62+
public synchronized Optional<InformerEventSource<ConfigMap, TestCustomResource>> eventSource(
63+
EventSourceContext<TestCustomResource> context) {
64+
var mockIES = mock(InformerEventSource.class);
65+
when(mockIES.name()).thenReturn(name);
66+
return Optional.of(mockIES);
67+
}
68+
5569
@Override
5670
public String toString() {
5771
return name();

0 commit comments

Comments
 (0)