Skip to content

Commit b12b5ce

Browse files
committed
fix: problems with rebase
1 parent abb7332 commit b12b5ce

File tree

7 files changed

+13
-24
lines changed

7 files changed

+13
-24
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public SecondaryToPrimaryMapper<R> getSecondaryToPrimaryMapper() {
6060
public Optional<BiPredicate<R, Boolean>> onDeleteFilter() {
6161
return Optional.ofNullable(onDeleteFilter);
6262
}
63+
6364
@Override
6465
public <P extends HasMetadata> PrimaryToSecondaryMapper<P> getPrimaryToSecondaryMapper() {
6566
return (PrimaryToSecondaryMapper<P>) primaryToSecondaryMapper;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,14 @@
88
import org.slf4j.LoggerFactory;
99

1010
import io.fabric8.kubernetes.api.model.HasMetadata;
11-
import io.fabric8.kubernetes.api.model.KubernetesResourceList;
12-
import io.fabric8.kubernetes.client.dsl.MixedOperation;
13-
import io.fabric8.kubernetes.client.dsl.Resource;
11+
import io.fabric8.kubernetes.client.KubernetesClient;
1412
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
1513
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
1614
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
1715
import io.javaoperatorsdk.operator.api.reconciler.dependent.RecentOperationEventFilter;
1816
import io.javaoperatorsdk.operator.processing.event.Event;
1917
import io.javaoperatorsdk.operator.processing.event.EventHandler;
2018
import io.javaoperatorsdk.operator.processing.event.ResourceID;
21-
import io.javaoperatorsdk.operator.processing.event.source.EventFilter;
2219
import io.javaoperatorsdk.operator.processing.event.source.PrimaryToSecondaryMapper;
2320

2421
/**
@@ -78,21 +75,15 @@ public class InformerEventSource<R extends HasMetadata, P extends HasMetadata>
7875
private final EventRecorder<R> eventRecorder = new EventRecorder<>();
7976
// we need direct control for the indexer to propagate the just update resource also to the index
8077
private final PrimaryToSecondaryIndex<R> primaryToSecondaryIndex;
81-
82-
private final PrimaryToSecondaryMapper primaryToSecondaryMapper;
83-
84-
protected final Predicate<R> onAddFilter;
85-
protected final BiPredicate<R, R> onUpdateFilter;
86-
protected final BiPredicate<R, Boolean> onDeleteFilter;
78+
private final PrimaryToSecondaryMapper<P> primaryToSecondaryMapper;
8779

8880
public InformerEventSource(
8981
InformerConfiguration<R> configuration, EventSourceContext<P> context) {
9082
this(configuration, context.getClient());
9183
}
9284

93-
public InformerEventSource(InformerConfiguration<R> configuration,
94-
MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client) {
95-
super(client, configuration);
85+
public InformerEventSource(InformerConfiguration<R> configuration, KubernetesClient client) {
86+
super(client.resources(configuration.getResourceClass()), configuration);
9687
this.configuration = configuration;
9788
primaryToSecondaryMapper = configuration.getPrimaryToSecondaryMapper();
9889
if (primaryToSecondaryMapper == null) {

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/UtilsTest.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
1010
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
1111
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
12-
import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
13-
import io.javaoperatorsdk.operator.processing.dependent.EmptyTestDependentResource;
1412
import io.javaoperatorsdk.operator.processing.dependent.EmptyTestDependentResource;
1513
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
1614
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSourceTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
import io.fabric8.kubernetes.api.model.ObjectMeta;
1010
import io.fabric8.kubernetes.api.model.apps.Deployment;
11+
import io.fabric8.kubernetes.client.KubernetesClient;
1112
import io.fabric8.kubernetes.client.dsl.FilterWatchListDeletable;
1213
import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable;
1314
import io.fabric8.kubernetes.client.dsl.MixedOperation;
@@ -21,11 +22,7 @@
2122

2223
import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_NAMESPACES_SET;
2324
import static org.mockito.ArgumentMatchers.any;
24-
import static org.mockito.Mockito.mock;
25-
import static org.mockito.Mockito.never;
26-
import static org.mockito.Mockito.times;
27-
import static org.mockito.Mockito.verify;
28-
import static org.mockito.Mockito.when;
25+
import static org.mockito.Mockito.*;
2926

3027
@SuppressWarnings({"rawtypes", "unchecked"})
3128
class InformerEventSourceTest {
@@ -35,6 +32,7 @@ class InformerEventSourceTest {
3532
private static final String NEXT_RESOURCE_VERSION = "2";
3633

3734
private InformerEventSource<Deployment, TestCustomResource> informerEventSource;
35+
private final KubernetesClient clientMock = mock(KubernetesClient.class);
3836
private final TemporaryResourceCache<Deployment> temporaryResourceCacheMock =
3937
mock(TemporaryResourceCache.class);
4038
private final EventHandler eventHandlerMock = mock(EventHandler.class);
@@ -49,6 +47,7 @@ class InformerEventSourceTest {
4947

5048
@BeforeEach
5149
void setup() {
50+
when(clientMock.resources(any())).thenReturn(crClientMock);
5251
when(crClientMock.inAnyNamespace()).thenReturn(specificResourceClientMock);
5352
when(specificResourceClientMock.withLabelSelector((String) null))
5453
.thenReturn(labeledResourceClientMock);
@@ -61,7 +60,7 @@ void setup() {
6160
.thenReturn(mock(SecondaryToPrimaryMapper.class));
6261
when(informerConfiguration.getResourceClass()).thenReturn(Deployment.class);
6362

64-
informerEventSource = new InformerEventSource<>(informerConfiguration, crClientMock);
63+
informerEventSource = new InformerEventSource<>(informerConfiguration, clientMock);
6564
informerEventSource.setTemporalResourceCache(temporaryResourceCacheMock);
6665
informerEventSource.setEventHandler(eventHandlerMock);
6766

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/PrimaryToSecondaryIndexTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class PrimaryToSecondaryIndexTest {
2020
private SecondaryToPrimaryMapper<ConfigMap> secondaryToPrimaryMapperMock =
2121
mock(SecondaryToPrimaryMapper.class);
2222
private PrimaryToSecondaryIndex<ConfigMap> primaryToSecondaryIndex =
23-
new PrimaryToSecondaryIndex<>(secondaryToPrimaryMapperMock);
23+
new DefaultPrimaryToSecondaryIndex<>(secondaryToPrimaryMapperMock);
2424

2525
private ResourceID primaryID1 = new ResourceID("id1", "default");
2626
private ResourceID primaryID2 = new ResourceID("id2", "default");

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ public Builder withPortForward(String namespace, String labelKey, String labelVa
239239

240240

241241
public Builder withAdditionalCustomResourceDefinition(
242-
Class<? extends CustomResource> customResource) {
242+
Class<? extends CustomResource> customResource) {
243243
additionalCustomResourceDefinitions.add(customResource);
244244
return this;
245245
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ public Map<String, EventSource> prepareEventSources(
106106
.withLabelSelector("integrationtest = " + this.getClass().getSimpleName())
107107
.build();
108108
informerEventSource =
109-
new InformerEventSource<>(informerConfiguration, client.resources(ConfigMap.class));
109+
new InformerEventSource<>(informerConfiguration, client);
110110
return EventSourceInitializer.nameEventSources(informerEventSource);
111111
}
112112

0 commit comments

Comments
 (0)