diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/LeaderElectionManager.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/LeaderElectionManager.java index 9d13d542c8..26f26afd1b 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/LeaderElectionManager.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/LeaderElectionManager.java @@ -13,6 +13,7 @@ import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectorBuilder; import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.LeaseLock; import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider; +import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager; import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration; public class LeaderElectionManager { @@ -43,7 +44,7 @@ public void init(LeaderElectionConfiguration config, KubernetesClient client) { // releaseOnCancel is not used in the underlying implementation leaderElector = new LeaderElectorBuilder( - client, ConfigurationServiceProvider.instance().getExecutorService()) + client, ExecutorServiceManager.instance().executorService()) .withConfig( new LeaderElectionConfig( lock, diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverriderTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverriderTest.java index 0ed9a9f4f6..607cde2935 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverriderTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverriderTest.java @@ -13,7 +13,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertNotEquals; class ConfigurationServiceOverriderTest { @@ -86,6 +86,7 @@ public Optional getLeaderElectionConfiguration() { .withClientConfiguration(new ConfigBuilder().withNamespace("newNS").build()) .checkingCRDAndValidateLocalModel(true) .withExecutorService(Executors.newSingleThreadExecutor()) + .withWorkflowExecutorService(Executors.newFixedThreadPool(4)) .withCloseClientOnStop(false) .withObjectMapper(new ObjectMapper()) .withResourceCloner(new Cloner() { @@ -111,6 +112,7 @@ public R clone(R object) { overridden.getTerminationTimeoutSeconds()); assertNotEquals(config.getClientConfiguration(), overridden.getClientConfiguration()); assertNotEquals(config.getExecutorService(), overridden.getExecutorService()); + assertNotEquals(config.getWorkflowExecutorService(), overridden.getWorkflowExecutorService()); assertNotEquals(config.getMetrics(), overridden.getMetrics()); assertNotEquals(config.getObjectMapper(), overridden.getObjectMapper()); assertNotEquals(config.getLeaderElectionConfiguration(),