Skip to content

fix: leader election manager init when not using config overrider #1636

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
Nov 30, 2022
Merged

fix: leader election manager init when not using config overrider #1636

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
2 changes: 1 addition & 1 deletion 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 @@ -60,9 +60,9 @@ public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider>
public Operator(KubernetesClient kubernetesClient, ConfigurationService configurationService) {
this.kubernetesClient =
kubernetesClient != null ? kubernetesClient : new KubernetesClientBuilder().build();
ConfigurationServiceProvider.set(configurationService);
configurationService.getLeaderElectionConfiguration()
.ifPresent(c -> leaderElectionManager.init(c, this.kubernetesClient));
ConfigurationServiceProvider.set(configurationService);
}

/** Adds a shutdown hook that automatically calls {@link #stop()} when the app shuts down. */
Expand Down
20 changes: 20 additions & 0 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
@@ -1,5 +1,7 @@
package io.javaoperatorsdk.operator;

import java.util.Optional;

import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
Expand All @@ -12,6 +14,7 @@
import io.javaoperatorsdk.operator.api.config.AbstractConfigurationService;
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
import io.javaoperatorsdk.operator.api.config.LeaderElectionConfiguration;
import io.javaoperatorsdk.operator.api.config.Version;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
Expand Down Expand Up @@ -84,6 +87,23 @@ void shouldBeAbleToProvideLeaderElectionConfiguration() {
.getLeaderElectionConfiguration().orElseThrow().getIdentity().orElseThrow());
}

@Test
void shouldBeAbleToInitLeaderElectionManagerWithoutOverrider() {
ConfigurationServiceProvider.reset();
final LeaderElectionConfiguration leaderElectionConfiguration =
new LeaderElectionConfiguration("leader-election-test", "namespace", "identity");
final AbstractConfigurationService configurationService =
new AbstractConfigurationService(Version.UNKNOWN) {
@Override
public Optional<LeaderElectionConfiguration> getLeaderElectionConfiguration() {
return Optional.of(leaderElectionConfiguration);
}
};
new Operator(kubernetesClient, configurationService);
assertEquals("identity", ConfigurationServiceProvider.instance()
.getLeaderElectionConfiguration().orElseThrow().getIdentity().orElseThrow());
}

@ControllerConfiguration
private static class FooReconciler implements Reconciler<ConfigMap> {

Expand Down