Skip to content

Commit 88fbe80

Browse files
committed
IT fixes
1 parent 4f3231e commit 88fbe80

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
package io.javaoperatorsdk.operator.processing.event.source.informer;
22

3-
import java.util.List;
4-
import java.util.Map;
5-
import java.util.Optional;
6-
import java.util.Set;
3+
import java.util.*;
74
import java.util.function.Function;
85
import java.util.function.Predicate;
96
import java.util.stream.Stream;
@@ -43,6 +40,7 @@ public abstract class ManagedInformerEventSource<R extends HasMetadata, P extend
4340
protected C configuration;
4441
protected MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client;
4542
protected ConfigurationService configurationService;
43+
protected Map<String, Function<R, List<String>>> indexerBuffer = new HashMap<>();
4644

4745
protected ManagedInformerEventSource(
4846
MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client, C configuration) {
@@ -131,7 +129,7 @@ void setTemporalResourceCache(TemporaryResourceCache<R> temporaryResourceCache)
131129
}
132130

133131
public void addIndexers(Map<String, Function<R, List<String>>> indexers) {
134-
manager().addIndexers(indexers);
132+
indexerBuffer.putAll(indexers);
135133
}
136134

137135
public List<R> byIndex(String indexName, String indexKey) {
@@ -177,6 +175,8 @@ public String toString() {
177175

178176
public void setConfigurationService(ConfigurationService configurationService) {
179177
cache = new InformerManager<>(client, configuration, configurationService, this);
178+
cache.addIndexers(indexerBuffer);
179+
indexerBuffer = null;
180180
this.configurationService = configurationService;
181181
}
182182

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
@@ -64,7 +64,7 @@ private LocallyRunOperatorExtension(
6464
this.portForwards = portForwards;
6565
this.localPortForwards = new ArrayList<>(portForwards.size());
6666
this.additionalCustomResourceDefinitions = additionalCustomResourceDefinitions;
67-
this.operator = new Operator(getKubernetesClient());
67+
this.operator = new Operator(getKubernetesClient(), configurationService);
6868
this.registeredControllers = new HashMap<>();
6969
this.configurationService = configurationService;
7070
}

operator-framework/src/main/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationService.java

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

99
public class DefaultConfigurationService extends BaseConfigurationService {
1010

11-
public DefaultConfigurationService() {}
12-
1311
@Override
1412
protected <R extends HasMetadata> ControllerConfiguration<R> configFor(Reconciler<R> reconciler) {
1513
final var other = super.configFor(reconciler);

0 commit comments

Comments
 (0)