fix config override sequence issue

Author: csviri

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

@@ -31,24 +31,23 @@ public Operator() {
   }
 
   public Operator(KubernetesClient kubernetesClient) {
-    this(kubernetesClient, ConfigurationServiceProvider.instance());
+    this(kubernetesClient, ConfigurationServiceProvider.instance(), null);
   }
 
   /**
    * @deprecated Use {@link #Operator(Consumer)} instead
    */
   @Deprecated
   public Operator(ConfigurationService configurationService) {
-    this(null, configurationService);
+    this(null, configurationService, null);
   }
 
   public Operator(Consumer<ConfigurationServiceOverrider> overrider) {
     this(null, overrider);
   }
 
   public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider> overrider) {
-    this(client);
-    ConfigurationServiceProvider.overrideCurrent(overrider);
+    this(client, ConfigurationServiceProvider.instance(), overrider);
   }
 
   /**
@@ -59,10 +58,18 @@ public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider>
    * @param configurationService provides configuration
    */
   public Operator(KubernetesClient kubernetesClient, ConfigurationService configurationService) {
+    this(kubernetesClient, configurationService, null);
+  }
+
+  private Operator(KubernetesClient kubernetesClient, ConfigurationService configurationService,
+      Consumer<ConfigurationServiceOverrider> overrider) {
     this.kubernetesClient =
         kubernetesClient != null ? kubernetesClient : new KubernetesClientBuilder().build();
     ConfigurationServiceProvider.set(configurationService);
-    configurationService.getLeaderElectionConfiguration()
+    if (overrider != null) {
+      ConfigurationServiceProvider.overrideCurrent(overrider);
+    }
+    ConfigurationServiceProvider.instance().getLeaderElectionConfiguration()
         .ifPresent(c -> leaderElectionManager.init(c, this.kubernetesClient));
   }
 

sample-operators/leader-election/src/test/java/io/javaoperatorsdk/operator/sample/LeaderElectionE2E.java

@@ -14,7 +14,6 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.condition.EnabledIfSystemProperty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,14 +40,14 @@ class LeaderElectionE2E {
 
   private static final String OPERATOR_1_POD_NAME = "leader-election-operator-1";
   private static final String OPERATOR_2_POD_NAME = "leader-election-operator-2";
-  public static final int MINIMAL_EXPECTED_RECONCILIATION = 2;
+  public static final int MINIMAL_EXPECTED_RECONCILIATION = 3;
 
   private String namespace;
   private KubernetesClient client;
 
   @Test
   // not for local mode by design
-  @EnabledIfSystemProperty(named = "test.deployment", matches = "remote")
+  // @EnabledIfSystemProperty(named = "test.deployment", matches = "remote")
   void otherInstancesTakesOverWhenSteppingDown() {
     log.info("Deploying operator");
     deployOperatorsInOrder();