Skip to content

Commit 80f631e

Browse files
authored
fix: remove get controllers from operator (#1191)
1 parent 4dfec23 commit 80f631e

File tree

3 files changed

+1
-25
lines changed

3 files changed

+1
-25
lines changed

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package io.javaoperatorsdk.operator;
22

3-
import java.util.ArrayList;
43
import java.util.HashMap;
5-
import java.util.List;
64
import java.util.Map;
75
import java.util.function.Consumer;
86

@@ -75,10 +73,6 @@ public KubernetesClient getKubernetesClient() {
7573
return kubernetesClient;
7674
}
7775

78-
public List<Controller> getControllers() {
79-
return new ArrayList<>(controllers.controllers.values());
80-
}
81-
8276
/**
8377
* Finishes the operator startup process. This is mostly used in injection-aware applications
8478
* where there is no obvious entrypoint to the application which can trigger the injection process

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/OperatorTest.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,10 @@
1010
import io.fabric8.kubernetes.client.KubernetesClient;
1111
import io.javaoperatorsdk.operator.api.config.AbstractConfigurationService;
1212
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
13-
import io.javaoperatorsdk.operator.api.config.MockControllerConfiguration;
1413
import io.javaoperatorsdk.operator.api.reconciler.Context;
1514
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
1615
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
1716

18-
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
19-
2017
@SuppressWarnings("rawtypes")
2118
class OperatorTest {
2219

@@ -30,20 +27,6 @@ static void setUpConfigurationServiceProvider() {
3027
ConfigurationServiceProvider.reset();
3128
}
3229

33-
@Test
34-
@DisplayName("should register `Reconciler` to Controller")
35-
public void shouldRegisterReconcilerToController() {
36-
// given
37-
final var configuration = MockControllerConfiguration.forResource(ConfigMap.class);
38-
39-
// when
40-
operator.register(fooReconciler, configuration);
41-
42-
// then
43-
assertThat(operator.getControllers().size()).isEqualTo(1);
44-
assertThat(operator.getControllers().get(0).getReconciler()).isEqualTo(fooReconciler);
45-
}
46-
4730
@Test
4831
@DisplayName("should throw `OperationException` when Configuration is null")
4932
public void shouldThrowOperatorExceptionWhenConfigurationIsNull() {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
1919
import io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider;
2020
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
21-
import io.javaoperatorsdk.operator.processing.Controller;
2221
import io.javaoperatorsdk.operator.processing.retry.Retry;
2322

2423
import static io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider.override;
@@ -65,7 +64,7 @@ public static Builder builder() {
6564
}
6665

6766
private Stream<Reconciler> reconcilers() {
68-
return operator.getControllers().stream().map(Controller::getReconciler);
67+
return reconcilers.stream().map(reconcilerSpec -> reconcilerSpec.reconciler);
6968
}
7069

7170
public List<Reconciler> getReconcilers() {

0 commit comments

Comments
 (0)