Skip to content

Commit 2f0d6a8

Browse files
committed
refactor: access configuration service from Operator when possible
1 parent b470286 commit 2f0d6a8

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,8 @@ public RuntimeInfo getRuntimeInfo() {
271271
boolean isStarted() {
272272
return started;
273273
}
274+
275+
public ConfigurationService getConfigurationService() {
276+
return configurationService;
277+
}
274278
}

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public class LocallyRunOperatorExtension extends AbstractOperatorExtension {
4040
private final List<LocalPortForward> localPortForwards;
4141
private final List<Class<? extends CustomResource>> additionalCustomResourceDefinitions;
4242
private final Map<Reconciler, RegisteredController> registeredControllers;
43-
private final ConfigurationService configurationService;
4443

4544
private LocallyRunOperatorExtension(
4645
List<ReconcilerSpec> reconcilers,
@@ -66,7 +65,6 @@ private LocallyRunOperatorExtension(
6665
this.additionalCustomResourceDefinitions = additionalCustomResourceDefinitions;
6766
this.operator = new Operator(getKubernetesClient(), configurationService);
6867
this.registeredControllers = new HashMap<>();
69-
this.configurationService = configurationService;
7068
}
7169

7270
/**
@@ -133,7 +131,7 @@ protected void before(ExtensionContext context) {
133131
.forEach(cr -> applyCrd(ReconcilerUtils.getResourceTypeName(cr)));
134132

135133
for (var ref : reconcilers) {
136-
final var config = configurationService.getConfigurationFor(ref.reconciler);
134+
final var config = operator.getConfigurationService().getConfigurationFor(ref.reconciler);
137135
final var oconfig = override(config);
138136

139137
if (Namespaced.class.isAssignableFrom(config.getResourceClass())) {

0 commit comments

Comments
 (0)