9
9
import org .slf4j .LoggerFactory ;
10
10
11
11
import io .fabric8 .kubernetes .api .model .HasMetadata ;
12
- import io .fabric8 .kubernetes .client .DefaultKubernetesClient ;
13
12
import io .fabric8 .kubernetes .client .KubernetesClient ;
14
13
import io .fabric8 .kubernetes .client .KubernetesClientBuilder ;
15
14
import io .fabric8 .kubernetes .client .Version ;
@@ -28,7 +27,7 @@ public class Operator implements LifecycleAware {
28
27
private volatile boolean started = false ;
29
28
30
29
public Operator () {
31
- this (new KubernetesClientBuilder (). build (), ConfigurationServiceProvider . instance () );
30
+ this (( KubernetesClient ) null );
32
31
}
33
32
34
33
public Operator (KubernetesClient kubernetesClient ) {
@@ -40,18 +39,16 @@ public Operator(KubernetesClient kubernetesClient) {
40
39
*/
41
40
@ Deprecated
42
41
public Operator (ConfigurationService configurationService ) {
43
- this (new DefaultKubernetesClient () , configurationService );
42
+ this (null , configurationService );
44
43
}
45
44
46
45
public Operator (Consumer <ConfigurationServiceOverrider > overrider ) {
47
- this (new KubernetesClientBuilder (). build () , overrider );
46
+ this (null , overrider );
48
47
}
49
48
50
49
public Operator (KubernetesClient client , Consumer <ConfigurationServiceOverrider > overrider ) {
51
- this . kubernetesClient = client ;
50
+ this ( client ) ;
52
51
ConfigurationServiceProvider .overrideCurrent (overrider );
53
- ConfigurationServiceProvider .instance ().getLeaderElectionConfiguration ()
54
- .ifPresent (c -> leaderElectionManager .init (c , kubernetesClient ));
55
52
}
56
53
57
54
/**
@@ -62,10 +59,11 @@ public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider>
62
59
* @param configurationService provides configuration
63
60
*/
64
61
public Operator (KubernetesClient kubernetesClient , ConfigurationService configurationService ) {
65
- this .kubernetesClient = kubernetesClient ;
62
+ this .kubernetesClient =
63
+ kubernetesClient != null ? kubernetesClient : new KubernetesClientBuilder ().build ();
66
64
ConfigurationServiceProvider .set (configurationService );
67
65
configurationService .getLeaderElectionConfiguration ()
68
- .ifPresent (c -> leaderElectionManager .init (c , kubernetesClient ));
66
+ .ifPresent (c -> leaderElectionManager .init (c , this . kubernetesClient ));
69
67
}
70
68
71
69
/** Adds a shutdown hook that automatically calls {@link #stop()} when the app shuts down. */
0 commit comments