Skip to content

Commit 94d6b2e

Browse files
authored
fix: use ExecutorServiceManager to retrieve executor (#1651)
1 parent af3afc4 commit 94d6b2e

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectorBuilder;
1414
import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.LeaseLock;
1515
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
16+
import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
1617
import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
1718

1819
public class LeaderElectionManager {
@@ -43,7 +44,7 @@ public void init(LeaderElectionConfiguration config, KubernetesClient client) {
4344
// releaseOnCancel is not used in the underlying implementation
4445
leaderElector =
4546
new LeaderElectorBuilder(
46-
client, ConfigurationServiceProvider.instance().getExecutorService())
47+
client, ExecutorServiceManager.instance().executorService())
4748
.withConfig(
4849
new LeaderElectionConfig(
4950
lock,

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverriderTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
import com.fasterxml.jackson.databind.ObjectMapper;
1515

16-
import static org.junit.jupiter.api.Assertions.*;
16+
import static org.junit.jupiter.api.Assertions.assertNotEquals;
1717

1818
class ConfigurationServiceOverriderTest {
1919

@@ -86,6 +86,7 @@ public Optional<LeaderElectionConfiguration> getLeaderElectionConfiguration() {
8686
.withClientConfiguration(new ConfigBuilder().withNamespace("newNS").build())
8787
.checkingCRDAndValidateLocalModel(true)
8888
.withExecutorService(Executors.newSingleThreadExecutor())
89+
.withWorkflowExecutorService(Executors.newFixedThreadPool(4))
8990
.withCloseClientOnStop(false)
9091
.withObjectMapper(new ObjectMapper())
9192
.withResourceCloner(new Cloner() {
@@ -111,6 +112,7 @@ public <R extends HasMetadata> R clone(R object) {
111112
overridden.getTerminationTimeoutSeconds());
112113
assertNotEquals(config.getClientConfiguration(), overridden.getClientConfiguration());
113114
assertNotEquals(config.getExecutorService(), overridden.getExecutorService());
115+
assertNotEquals(config.getWorkflowExecutorService(), overridden.getWorkflowExecutorService());
114116
assertNotEquals(config.getMetrics(), overridden.getMetrics());
115117
assertNotEquals(config.getObjectMapper(), overridden.getObjectMapper());
116118
assertNotEquals(config.getLeaderElectionConfiguration(),

0 commit comments

Comments
 (0)