Skip to content

Commit c77db84

Browse files
committed
migrate to v6
1 parent 09d9c5f commit c77db84

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

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

+6-4
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@
66
import org.slf4j.LoggerFactory;
77

88
import io.fabric8.kubernetes.client.KubernetesClient;
9-
import io.fabric8.kubernetes.client.NamespacedKubernetesClient;
109
import io.fabric8.kubernetes.client.extended.leaderelection.LeaderCallbacks;
1110
import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectionConfig;
1211
import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElector;
1312
import io.fabric8.kubernetes.client.extended.leaderelection.LeaderElectorBuilder;
1413
import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.LeaseLock;
1514
import io.fabric8.kubernetes.client.extended.leaderelection.resourcelock.Lock;
15+
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
1616
import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
1717

1818
public class LeaderElectionManager {
1919

2020
private static final Logger log = LoggerFactory.getLogger(LeaderElectionManager.class);
2121

22-
private LeaderElector<NamespacedKubernetesClient> leaderElector = null;
22+
private LeaderElector leaderElector = null;
2323
private ControllerManager controllerManager;
2424

2525
public LeaderElectionManager(ControllerManager controllerManager) {
@@ -28,8 +28,10 @@ public LeaderElectionManager(ControllerManager controllerManager) {
2828

2929
public void init(LeaderElectionConfiguration config, KubernetesClient client) {
3030
Lock lock = new LeaseLock(config.getLeaseNamespace(), config.getLeaseName(), identity(config));
31-
// the releaseOnCancel does not seem to be used anywhere
32-
leaderElector = new LeaderElectorBuilder<>((NamespacedKubernetesClient) client)
31+
// todo releaseOnCancel
32+
// todo use this executor service?
33+
leaderElector = new LeaderElectorBuilder(client,
34+
ConfigurationServiceProvider.instance().getExecutorService())
3335
.withConfig(
3436
new LeaderElectionConfig(lock, config.getLeaseDuration(), config.getRenewDeadline(),
3537
config.getRetryPeriod(), leaderCallbacks(), true, config.getLeaseName()))

0 commit comments

Comments
 (0)