Skip to content

Commit 6d51e0e

Browse files
committed
fix: update after rebase
1 parent 3e8b6dc commit 6d51e0e

File tree

7 files changed

+37
-15
lines changed

7 files changed

+37
-15
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import java.util.Set;
88
import java.util.concurrent.TimeUnit;
99
import java.util.function.Function;
10+
import java.util.function.UnaryOperator;
1011
import java.util.stream.Collectors;
1112

1213
import org.slf4j.Logger;
@@ -144,6 +145,8 @@ protected <P extends HasMetadata> ControllerConfiguration<P> configFor(Reconcile
144145
Utils.contextFor(name, null, null)),
145146
Utils.instantiate(annotation.genericFilter(), GenericFilter.class,
146147
Utils.contextFor(name, null, null)),
148+
Utils.instantiate(annotation.cachePruneFunction(), UnaryOperator.class,
149+
Utils.contextFor(name, null, null)),
147150
Set.of(valueOrDefault(annotation,
148151
io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration::namespaces,
149152
DEFAULT_NAMESPACES_SET.toArray(String[]::new))),
@@ -250,14 +253,15 @@ private static <T> T valueOrDefault(
250253
return mapper.apply(controllerConfiguration);
251254
}
252255
}
253-
256+
@SuppressWarnings("rawtypes")
254257
private static String getName(String name, Class<? extends DependentResource> dependentType) {
255258
if (name.isBlank()) {
256259
name = DependentResource.defaultNameFor(dependentType);
257260
}
258261
return name;
259262
}
260263

264+
@SuppressWarnings("unused")
261265
private static <T> Configurator<T> configuratorFor(Class<T> instanceType,
262266
Reconciler<?> reconciler) {
263267
return instance -> configureFromAnnotatedReconciler(instance, reconciler);

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@ public interface ControllerConfiguration<P extends HasMetadata> extends Resource
2323
RateLimiter DEFAULT_RATE_LIMITER = LinearRateLimiter.deactivatedRateLimiter();
2424

2525
default String getName() {
26-
return ReconcilerUtils.getDefaultReconcilerName(getAssociatedReconcilerClassName());
26+
return ensureValidName(null, getAssociatedReconcilerClassName());
2727
}
2828

2929
default String getFinalizerName() {
3030
return ReconcilerUtils.getDefaultFinalizerName(getResourceClass());
3131
}
3232

33+
static String ensureValidName(String name, String reconcilerClassName) {
34+
return name != null ? name : ReconcilerUtils.getDefaultReconcilerName(reconcilerClassName);
35+
}
36+
3337
static String ensureValidFinalizerName(String finalizer, String resourceTypeName) {
3438
if (finalizer != null && !finalizer.isBlank()) {
3539
if (ReconcilerUtils.isFinalizerValid(finalizer)) {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ public ControllerConfiguration<R> build() {
204204
final var overridden = new ResolvedControllerConfiguration<>(
205205
original.getResourceClass(), original.getName(),
206206
generationAware, original.getAssociatedReconcilerClassName(), retry, rateLimiter,
207-
reconciliationMaxInterval, onAddFilter, onUpdateFilter, genericFilter, newDependentSpecs,
207+
reconciliationMaxInterval, onAddFilter, onUpdateFilter, genericFilter, cachePruneFunction,
208+
newDependentSpecs,
208209
namespaces, finalizer, labelSelector);
209210
overridden.setEventFilter(customResourcePredicate);
210211
return overridden;

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Optional;
77
import java.util.Set;
88
import java.util.concurrent.TimeUnit;
9+
import java.util.function.UnaryOperator;
910

1011
import io.fabric8.kubernetes.api.model.HasMetadata;
1112
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
@@ -38,7 +39,8 @@ public ResolvedControllerConfiguration(Class<P> resourceClass, ControllerConfigu
3839
other.getAssociatedReconcilerClassName(), other.getRetry(), other.getRateLimiter(),
3940
other.maxReconciliationInterval().orElse(null),
4041
other.onAddFilter().orElse(null), other.onUpdateFilter().orElse(null),
41-
other.genericFilter().orElse(null), other.getDependentResources(), other.getNamespaces(),
42+
other.genericFilter().orElse(null), other.cachePruneFunction().orElse(null),
43+
other.getDependentResources(), other.getNamespaces(),
4244
other.getFinalizerName(), other.getLabelSelector());
4345
}
4446

@@ -63,10 +65,11 @@ public ResolvedControllerConfiguration(Class<P> resourceClass, String name,
6365
boolean generationAware, String associatedReconcilerClassName, Retry retry,
6466
RateLimiter rateLimiter, Duration maxReconciliationInterval,
6567
OnAddFilter<P> onAddFilter, OnUpdateFilter<P> onUpdateFilter,
66-
GenericFilter<P> genericFilter, List<DependentResourceSpec> dependentResources,
68+
GenericFilter<P> genericFilter, UnaryOperator<P> cachePruneFunction,
69+
List<DependentResourceSpec> dependentResources,
6770
Set<String> namespaces, String finalizer, String labelSelector) {
6871
this(resourceClass, name, generationAware, associatedReconcilerClassName, retry, rateLimiter,
69-
maxReconciliationInterval, onAddFilter, onUpdateFilter, genericFilter,
72+
maxReconciliationInterval, onAddFilter, onUpdateFilter, genericFilter, cachePruneFunction,
7073
namespaces, finalizer, labelSelector);
7174
setDependentResources(dependentResources);
7275
}
@@ -75,9 +78,11 @@ protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
7578
boolean generationAware, String associatedReconcilerClassName, Retry retry,
7679
RateLimiter rateLimiter, Duration maxReconciliationInterval,
7780
OnAddFilter<P> onAddFilter, OnUpdateFilter<P> onUpdateFilter, GenericFilter<P> genericFilter,
81+
UnaryOperator<P> cachePruneFunction,
7882
Set<String> namespaces, String finalizer, String labelSelector) {
79-
super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter);
80-
this.name = name;
83+
super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter,
84+
cachePruneFunction);
85+
this.name = ControllerConfiguration.ensureValidName(name, associatedReconcilerClassName);
8186
this.generationAware = generationAware;
8287
this.associatedReconcilerClassName = associatedReconcilerClassName;
8388
this.retry = ensureRetry(retry);
@@ -91,7 +96,7 @@ protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
9196
protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
9297
Class<? extends Reconciler> reconcilerClas) {
9398
this(resourceClass, name, false, getAssociatedReconcilerClassName(reconcilerClas), null, null,
94-
null, null, null, null,
99+
null, null, null, null, null,
95100
null, null, null);
96101
}
97102

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
import io.javaoperatorsdk.operator.processing.event.source.filter.OnDeleteFilter;
1818
import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
1919
import io.javaoperatorsdk.operator.processing.event.source.informer.Mappers;
20-
import java.util.function.UnaryOperator;
2120

2221
import static io.javaoperatorsdk.operator.api.reconciler.Constants.DEFAULT_NAMESPACES_SET;
2322

@@ -42,7 +41,8 @@ protected DefaultInformerConfiguration(String labelSelector,
4241
OnDeleteFilter<R> onDeleteFilter,
4342
GenericFilter<R> genericFilter,
4443
UnaryOperator<R> cachePruneFunction) {
45-
super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter, cachePruneFunction);
44+
super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter,
45+
cachePruneFunction);
4646
this.followControllerNamespaceChanges = followControllerNamespaceChanges;
4747

4848
this.primaryToSecondaryMapper = primaryToSecondaryMapper;
@@ -67,6 +67,7 @@ public Optional<OnDeleteFilter<R>> onDeleteFilter() {
6767
}
6868

6969
@Override
70+
@SuppressWarnings("unchecked")
7071
public <P extends HasMetadata> PrimaryToSecondaryMapper<P> getPrimaryToSecondaryMapper() {
7172
return (PrimaryToSecondaryMapper<P>) primaryToSecondaryMapper;
7273
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ private static class ControllerConfig<T extends HasMetadata> extends
136136
public ControllerConfig(String finalizer, boolean generationAware,
137137
ResourceEventFilter<T> eventFilter, Class<T> customResourceClass) {
138138
super(customResourceClass,
139-
null,
139+
"test",
140140
generationAware,
141141
null,
142142
null,

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/controller/ControllerResourceEventSourceTest.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
2121

2222
import static org.mockito.ArgumentMatchers.eq;
23-
import static org.mockito.Mockito.*;
23+
import static org.mockito.Mockito.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;
2428

2529
class ControllerResourceEventSourceTest extends
2630
AbstractEventSourceTestBase<ControllerResourceEventSource<TestCustomResource>, EventHandler> {
@@ -180,7 +184,7 @@ public TestConfiguration(boolean generationAware, OnAddFilter<TestCustomResource
180184
GenericFilter<TestCustomResource> genericFilter) {
181185
super(
182186
TestCustomResource.class,
183-
null,
187+
"test",
184188
generationAware,
185189
null,
186190
null,
@@ -190,7 +194,10 @@ public TestConfiguration(boolean generationAware, OnAddFilter<TestCustomResource
190194
onUpdateFilter,
191195
genericFilter,
192196
null,
193-
FINALIZER, null, null);
197+
null,
198+
null,
199+
FINALIZER,
200+
null);
194201
}
195202
}
196203
}

0 commit comments

Comments
 (0)