Skip to content

refactor: avoid unneeded initializations in injection contexts #2950

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

refactor: avoid unneeded initializations in injection contexts #2950

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
37 changes: 26 additions & 11 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
Expand Up @@ -24,17 +24,17 @@
public class Operator implements LifecycleAware {
private static final Logger log = LoggerFactory.getLogger(Operator.class);

private final ControllerManager controllerManager;
private final LeaderElectionManager leaderElectionManager;
private final ConfigurationService configurationService;
private ControllerManager controllerManager;
private LeaderElectionManager leaderElectionManager;
private ConfigurationService configurationService;
private volatile boolean started = false;

public Operator() {
this((KubernetesClient) null);
init(initConfigurationService(null, null), true);
}

Operator(KubernetesClient kubernetesClient) {
this(initConfigurationService(kubernetesClient, null));
init(initConfigurationService(kubernetesClient, null), false);
}

/**
Expand All @@ -46,12 +46,23 @@ public Operator() {
* operator
*/
public Operator(ConfigurationService configurationService) {
this.configurationService = configurationService;
init(configurationService, false);
}

private void init(ConfigurationService configurationService, boolean allowDeferredInit) {
if (configurationService == null) {
if (!allowDeferredInit) {
throw new IllegalStateException(
"Deferred initialization of ConfigurationService is not allowed");
}
} else {
this.configurationService = configurationService;

final var executorServiceManager = configurationService.getExecutorServiceManager();
controllerManager = new ControllerManager(executorServiceManager);
final var executorServiceManager = configurationService.getExecutorServiceManager();
controllerManager = new ControllerManager(executorServiceManager);

leaderElectionManager = new LeaderElectionManager(controllerManager, configurationService);
leaderElectionManager = new LeaderElectionManager(controllerManager, configurationService);
}
}

/**
Expand All @@ -62,10 +73,14 @@ public Operator(ConfigurationService configurationService) {
* {@link ConfigurationService} values
*/
public Operator(Consumer<ConfigurationServiceOverrider> overrider) {
this(initConfigurationService(null, overrider));
init(initConfigurationService(null, overrider), false);
}

private static ConfigurationService initConfigurationService(
/**
* Overridable by subclasses to enable deferred configuration, useful to avoid unneeded processing
* in injection scenarios
*/
protected ConfigurationService initConfigurationService(
KubernetesClient client, Consumer<ConfigurationServiceOverrider> overrider) {
// initialize the client if the user didn't provide one
if (client == null) {
Expand Down