Skip to content

Commit f5e22f4

Browse files
committed
naming
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 7b72d35 commit f5e22f4

File tree

8 files changed

+22
-24
lines changed

8 files changed

+22
-24
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -304,8 +304,8 @@ private <P extends HasMetadata> ResolvedControllerConfiguration<P> controllerCon
304304
final var dependentFieldManager =
305305
fieldManager.equals(CONTROLLER_NAME_AS_FIELD_MANAGER) ? name : fieldManager;
306306

307-
var propagateAllEventToReconciler =
308-
annotation != null && annotation.propagateAllEventToReconciler();
307+
var triggerReconcilerOnAllEvent =
308+
annotation != null && annotation.triggerReconcilerOnAllEvent();
309309

310310
InformerConfiguration<P> informerConfig =
311311
InformerConfiguration.builder(resourceClass)
@@ -327,7 +327,7 @@ private <P extends HasMetadata> ResolvedControllerConfiguration<P> controllerCon
327327
dependentFieldManager,
328328
this,
329329
informerConfig,
330-
propagateAllEventToReconciler);
330+
triggerReconcilerOnAllEvent);
331331
}
332332

333333
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ default String fieldManager() {
9393

9494
<C> C getConfigurationFor(DependentResourceSpec<?, P, C> spec);
9595

96-
default boolean propagateAllEventToReconciler() {
96+
default boolean triggerReconcilerOnAllEvent() {
9797
return false;
9898
}
9999
}

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class ControllerConfigurationOverrider<R extends HasMetadata> {
3030
private Duration reconciliationMaxInterval;
3131
private Map<DependentResourceSpec, Object> configurations;
3232
private final InformerConfiguration<R>.Builder config;
33-
private boolean propagateAllEventToReconciler;
33+
private boolean triggerReconcilerOnAllEvent;
3434

3535
private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
3636
this.finalizer = original.getFinalizerName();
@@ -43,7 +43,7 @@ private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
4343
this.rateLimiter = original.getRateLimiter();
4444
this.name = original.getName();
4545
this.fieldManager = original.fieldManager();
46-
this.propagateAllEventToReconciler = original.propagateAllEventToReconciler();
46+
this.triggerReconcilerOnAllEvent = original.triggerReconcilerOnAllEvent();
4747
}
4848

4949
public ControllerConfigurationOverrider<R> withFinalizer(String finalizer) {
@@ -156,9 +156,9 @@ public ControllerConfigurationOverrider<R> withFieldManager(String dependentFiel
156156
return this;
157157
}
158158

159-
public ControllerConfigurationOverrider<R> withPropagateAllEventToReconciler(
160-
boolean propagateAllEventToReconciler) {
161-
this.propagateAllEventToReconciler = propagateAllEventToReconciler;
159+
public ControllerConfigurationOverrider<R> withTriggerReconcilerOnAllEvent(
160+
boolean triggerReconcilerOnAllEvent) {
161+
this.triggerReconcilerOnAllEvent = triggerReconcilerOnAllEvent;
162162
return this;
163163
}
164164

@@ -206,7 +206,7 @@ public ControllerConfiguration<R> build() {
206206
fieldManager,
207207
original.getConfigurationService(),
208208
config.buildForController(),
209-
propagateAllEventToReconciler,
209+
triggerReconcilerOnAllEvent,
210210
original.getWorkflowSpec().orElse(null));
211211
}
212212

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public class ResolvedControllerConfiguration<P extends HasMetadata>
2929
private final Map<DependentResourceSpec, Object> configurations;
3030
private final ConfigurationService configurationService;
3131
private final String fieldManager;
32-
private final boolean propagateAllEventToReconciler;
32+
private final boolean triggerReconcilerOnAllEvent;
3333
private WorkflowSpec workflowSpec;
3434

3535
public ResolvedControllerConfiguration(ControllerConfiguration<P> other) {
@@ -45,7 +45,7 @@ public ResolvedControllerConfiguration(ControllerConfiguration<P> other) {
4545
other.fieldManager(),
4646
other.getConfigurationService(),
4747
other.getInformerConfig(),
48-
other.propagateAllEventToReconciler(),
48+
other.triggerReconcilerOnAllEvent(),
4949
other.getWorkflowSpec().orElse(null));
5050
}
5151

@@ -61,7 +61,7 @@ public ResolvedControllerConfiguration(
6161
String fieldManager,
6262
ConfigurationService configurationService,
6363
InformerConfiguration<P> informerConfig,
64-
boolean propagateAllEventToReconciler,
64+
boolean triggerReconcilerOnAllEvent,
6565
WorkflowSpec workflowSpec) {
6666
this(
6767
name,
@@ -75,7 +75,7 @@ public ResolvedControllerConfiguration(
7575
fieldManager,
7676
configurationService,
7777
informerConfig,
78-
propagateAllEventToReconciler);
78+
triggerReconcilerOnAllEvent);
7979
setWorkflowSpec(workflowSpec);
8080
}
8181

@@ -91,7 +91,7 @@ protected ResolvedControllerConfiguration(
9191
String fieldManager,
9292
ConfigurationService configurationService,
9393
InformerConfiguration<P> informerConfig,
94-
boolean propagateAllEventToReconciler) {
94+
boolean triggerReconcilerOnAllEvent) {
9595
this.informerConfig = informerConfig;
9696
this.configurationService = configurationService;
9797
this.name = ControllerConfiguration.ensureValidName(name, associatedReconcilerClassName);
@@ -104,7 +104,7 @@ protected ResolvedControllerConfiguration(
104104
this.finalizer =
105105
ControllerConfiguration.ensureValidFinalizerName(finalizer, getResourceTypeName());
106106
this.fieldManager = fieldManager;
107-
this.propagateAllEventToReconciler = propagateAllEventToReconciler;
107+
this.triggerReconcilerOnAllEvent = triggerReconcilerOnAllEvent;
108108
}
109109

110110
protected ResolvedControllerConfiguration(
@@ -216,7 +216,7 @@ public String fieldManager() {
216216
}
217217

218218
@Override
219-
public boolean propagateAllEventToReconciler() {
220-
return ControllerConfiguration.super.propagateAllEventToReconciler();
219+
public boolean triggerReconcilerOnAllEvent() {
220+
return triggerReconcilerOnAllEvent;
221221
}
222222
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,5 +78,5 @@ MaxReconciliationInterval maxReconciliationInterval() default
7878
*/
7979
String fieldManager() default CONTROLLER_NAME_AS_FIELD_MANAGER;
8080

81-
boolean propagateAllEventToReconciler() default false;
81+
boolean triggerReconcilerOnAllEvent() default false;
8282
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,6 @@ public synchronized boolean isRunning() {
548548

549549
// shortening
550550
private boolean propagateAllEvent() {
551-
return controllerConfiguration.propagateAllEventToReconciler();
551+
return controllerConfiguration.triggerReconcilerOnAllEvent();
552552
}
553553
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,6 +536,6 @@ private Resource<R> resource(R resource) {
536536
}
537537

538538
private boolean propagateAllEvent() {
539-
return configuration().propagateAllEventToReconciler();
539+
return configuration().triggerReconcilerOnAllEvent();
540540
}
541541
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/propagateallevent/onlyreconcile/PropagateEventReconciler.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@
1111
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
1212
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
1313

14-
@ControllerConfiguration(
15-
propagateAllEventToReconciler = true,
16-
generationAwareEventProcessing = false)
14+
@ControllerConfiguration(triggerReconcilerOnAllEvent = true, generationAwareEventProcessing = false)
1715
public class PropagateEventReconciler implements Reconciler<PropagateAllEventCustomResource> {
1816

1917
private static final Logger log = LoggerFactory.getLogger(PropagateEventReconciler.class);

0 commit comments

Comments
 (0)