Skip to content

fix: remove get controllers from operator #1191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2022
Merged

fix: remove get controllers from operator #1191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions operator-framework-core/src/main/java/io/javaoperatorsdk/operator/Operator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package io.javaoperatorsdk.operator;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.function.Consumer;

Expand Down Expand Up @@ -75,10 +73,6 @@ public KubernetesClient getKubernetesClient() {
return kubernetesClient;
}

public List<Controller> getControllers() {
return new ArrayList<>(controllers.controllers.values());
}

/**
* Finishes the operator startup process. This is mostly used in injection-aware applications
* where there is no obvious entrypoint to the application which can trigger the injection process
Expand Down
17 changes: 0 additions & 17 deletions operator-framework-core/src/test/java/io/javaoperatorsdk/operator/OperatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,10 @@
import io.fabric8.kubernetes.client.KubernetesClient;
import io.javaoperatorsdk.operator.api.config.AbstractConfigurationService;
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
import io.javaoperatorsdk.operator.api.config.MockControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;

import static org.assertj.core.api.AssertionsForClassTypes.assertThat;

@SuppressWarnings("rawtypes")
class OperatorTest {

Expand All @@ -30,20 +27,6 @@ static void setUpConfigurationServiceProvider() {
ConfigurationServiceProvider.reset();
}

@Test
@DisplayName("should register `Reconciler` to Controller")
public void shouldRegisterReconcilerToController() {
// given
final var configuration = MockControllerConfiguration.forResource(ConfigMap.class);

// when
operator.register(fooReconciler, configuration);

// then
assertThat(operator.getControllers().size()).isEqualTo(1);
assertThat(operator.getControllers().get(0).getReconciler()).isEqualTo(fooReconciler);
}

@Test
@DisplayName("should throw `OperationException` when Configuration is null")
public void shouldThrowOperatorExceptionWhenConfigurationIsNull() {
Expand Down
3 changes: 1 addition & 2 deletions ...r-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
import io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.processing.Controller;
import io.javaoperatorsdk.operator.processing.retry.Retry;

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

private Stream<Reconciler> reconcilers() {
return operator.getControllers().stream().map(Controller::getReconciler);
return reconcilers.stream().map(reconcilerSpec -> reconcilerSpec.reconciler);
}

public List<Reconciler> getReconcilers() {
Expand Down