Skip to content

Commit 440bf0f

Browse files
metacosmcsviri
authored andcommitted
refactor: make sure all constructors cascade
1 parent 6361b36 commit 440bf0f

File tree

1 file changed

+7
-9
lines changed
  • operator-framework-core/src/main/java/io/javaoperatorsdk/operator

1 file changed

+7
-9
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.slf4j.LoggerFactory;
1010

1111
import io.fabric8.kubernetes.api.model.HasMetadata;
12-
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
1312
import io.fabric8.kubernetes.client.KubernetesClient;
1413
import io.fabric8.kubernetes.client.KubernetesClientBuilder;
1514
import io.fabric8.kubernetes.client.Version;
@@ -28,7 +27,7 @@ public class Operator implements LifecycleAware {
2827
private volatile boolean started = false;
2928

3029
public Operator() {
31-
this(new KubernetesClientBuilder().build(), ConfigurationServiceProvider.instance());
30+
this((KubernetesClient) null);
3231
}
3332

3433
public Operator(KubernetesClient kubernetesClient) {
@@ -40,18 +39,16 @@ public Operator(KubernetesClient kubernetesClient) {
4039
*/
4140
@Deprecated
4241
public Operator(ConfigurationService configurationService) {
43-
this(new DefaultKubernetesClient(), configurationService);
42+
this(null, configurationService);
4443
}
4544

4645
public Operator(Consumer<ConfigurationServiceOverrider> overrider) {
47-
this(new KubernetesClientBuilder().build(), overrider);
46+
this(null, overrider);
4847
}
4948

5049
public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider> overrider) {
51-
this.kubernetesClient = client;
50+
this(client);
5251
ConfigurationServiceProvider.overrideCurrent(overrider);
53-
ConfigurationServiceProvider.instance().getLeaderElectionConfiguration()
54-
.ifPresent(c -> leaderElectionManager.init(c, kubernetesClient));
5552
}
5653

5754
/**
@@ -62,10 +59,11 @@ public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider>
6259
* @param configurationService provides configuration
6360
*/
6461
public Operator(KubernetesClient kubernetesClient, ConfigurationService configurationService) {
65-
this.kubernetesClient = kubernetesClient;
62+
this.kubernetesClient =
63+
kubernetesClient != null ? kubernetesClient : new KubernetesClientBuilder().build();
6664
ConfigurationServiceProvider.set(configurationService);
6765
configurationService.getLeaderElectionConfiguration()
68-
.ifPresent(c -> leaderElectionManager.init(c, kubernetesClient));
66+
.ifPresent(c -> leaderElectionManager.init(c, this.kubernetesClient));
6967
}
7068

7169
/** Adds a shutdown hook that automatically calls {@link #stop()} when the app shuts down. */

0 commit comments

Comments
 (0)