Skip to content

Commit 83ad830

Browse files
committed
refactor: move getDependentResources back to ControllerConfiguration
1 parent 12d9e6b commit 83ad830

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
import io.fabric8.kubernetes.api.model.HasMetadata;
44
import io.javaoperatorsdk.operator.ReconcilerUtils;
5+
import io.javaoperatorsdk.operator.api.reconciler.DependentResource;
56
import io.javaoperatorsdk.operator.processing.event.source.ResourceEventFilter;
7+
import java.util.Collections;
8+
import java.util.List;
69

710
public interface ControllerConfiguration<R extends HasMetadata> extends
811
ResourceConfiguration<R, ControllerConfiguration<R>> {
@@ -34,4 +37,8 @@ default boolean useFinalizer() {
3437
default ResourceEventFilter<R, ControllerConfiguration<R>> getEventFilter() {
3538
return ResourceConfiguration.super.getEventFilter();
3639
}
40+
41+
default List<? extends DependentResource> getDependentResources() {
42+
return Collections.emptyList();
43+
}
3744
}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,4 @@ default DeleteControl cleanup(R resource, Context context) {
5050
* and it's not marked for deletion.</b>
5151
*/
5252
UpdateControl<R> reconcile(R resource, Context context);
53-
54-
default List<DependentResource> getDependentResources() {
55-
return Collections.emptyList();
56-
}
5753
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public DeleteControl execute() {
7474
public UpdateControl<R> reconcile(R resource, Context context) {
7575
final var metrics = configuration.getConfigurationService().getMetrics();
7676

77-
getDependentResources().forEach(dependent -> {
77+
configuration.getDependentResources().forEach(dependent -> {
7878
final var conf = dependent.getConfiguration();
7979

8080
if (!conf.creatable() && !conf.updatable()) {
@@ -141,7 +141,7 @@ public UpdateControl<R> execute() {
141141

142142
@Override
143143
public void prepareEventSources(EventSourceRegistry<R> eventSourceRegistry, Cloner cloner) {
144-
getDependentResources().forEach(dependent -> {
144+
configuration.getDependentResources().forEach(dependent -> {
145145
final var dependentConfiguration = dependent.getConfiguration();
146146
eventSourceRegistry.registerEventSource(new ResourceEventSource<>(dependentConfiguration,
147147
kubernetesClient.resources(dependentConfiguration.getResourceClass()), cloner) {

0 commit comments

Comments
 (0)