feat: retrieve ConfigurationService from ConfigurationServiceProvider (#1010)

Author: metacosm

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

@@ -14,6 +14,8 @@
 import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.Version;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ConfigurationServiceOverrider;
+import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.config.ControllerConfigurationOverrider;
 import io.javaoperatorsdk.operator.api.config.ExecutorServiceManager;
@@ -25,14 +27,33 @@
 public class Operator implements LifecycleAware {
   private static final Logger log = LoggerFactory.getLogger(Operator.class);
   private final KubernetesClient kubernetesClient;
-  private final ConfigurationService configurationService;
   private final ControllerManager controllers = new ControllerManager();
 
+  public Operator() {
+    this(new DefaultKubernetesClient(), ConfigurationServiceProvider.instance());
+  }
+
+  public Operator(KubernetesClient kubernetesClient) {
+    this(kubernetesClient, ConfigurationServiceProvider.instance());
+  }
 
+  /**
+   * @deprecated Use {@link #Operator(Consumer)} instead
+   */
+  @Deprecated
   public Operator(ConfigurationService configurationService) {
     this(new DefaultKubernetesClient(), configurationService);
   }
 
+  public Operator(Consumer<ConfigurationServiceOverrider> overrider) {
+    this(new DefaultKubernetesClient(), overrider);
+  }
+
+  public Operator(KubernetesClient client, Consumer<ConfigurationServiceOverrider> overrider) {
+    this(client);
+    ConfigurationServiceProvider.overrideCurrent(overrider);
+  }
+
   /**
    * Note that Operator by default closes the client on stop, this can be changed using
    * {@link ConfigurationService}
@@ -42,7 +63,7 @@ public Operator(ConfigurationService configurationService) {
    */
   public Operator(KubernetesClient kubernetesClient, ConfigurationService configurationService) {
     this.kubernetesClient = kubernetesClient;
-    this.configurationService = configurationService;
+    ConfigurationServiceProvider.set(configurationService);
   }
 
   /** Adds a shutdown hook that automatically calls {@link #stop()} ()} when the app shuts down. */
@@ -54,10 +75,6 @@ public KubernetesClient getKubernetesClient() {
     return kubernetesClient;
   }
 
-  public ConfigurationService getConfigurationService() {
-    return configurationService;
-  }
-
   public List<Controller> getControllers() {
     return new ArrayList<>(controllers.controllers.values());
   }
@@ -70,7 +87,7 @@ public List<Controller> getControllers() {
   public void start() {
     controllers.shouldStart();
 
-    final var version = configurationService.getVersion();
+    final var version = ConfigurationServiceProvider.instance().getVersion();
     log.info(
         "Operator SDK {} (commit: {}) built on {} starting...",
         version.getSdkVersion(),
@@ -80,12 +97,13 @@ public void start() {
     final var clientVersion = Version.clientVersion();
     log.info("Client version: {}", clientVersion);
 
-    ExecutorServiceManager.init(configurationService);
+    ExecutorServiceManager.init();
     controllers.start();
   }
 
   @Override
   public void stop() throws OperatorException {
+    final var configurationService = ConfigurationServiceProvider.instance();
     log.info(
         "Operator SDK {} is shutting down...", configurationService.getVersion().getSdkVersion());
 
@@ -107,7 +125,8 @@ public void stop() throws OperatorException {
    */
   public <R extends HasMetadata> void register(Reconciler<R> reconciler)
       throws OperatorException {
-    final var controllerConfiguration = configurationService.getConfigurationFor(reconciler);
+    final var controllerConfiguration =
+        ConfigurationServiceProvider.instance().getConfigurationFor(reconciler);
     register(reconciler, controllerConfiguration);
   }
 
@@ -132,7 +151,8 @@ public <R extends HasMetadata> void register(Reconciler<R> reconciler,
           "Cannot register reconciler with name " + reconciler.getClass().getCanonicalName() +
               " reconciler named " + ReconcilerUtils.getNameFor(reconciler)
               + " because its configuration cannot be found.\n" +
-              " Known reconcilers are: " + configurationService.getKnownReconcilerNames());
+              " Known reconcilers are: "
+              + ConfigurationServiceProvider.instance().getKnownReconcilerNames());
     }
 
     final var controller = new Controller<>(reconciler, configuration, kubernetesClient);
@@ -158,7 +178,8 @@ public <R extends HasMetadata> void register(Reconciler<R> reconciler,
    */
   public <R extends HasMetadata> void register(Reconciler<R> reconciler,
       Consumer<ControllerConfigurationOverrider<R>> configOverrider) {
-    final var controllerConfiguration = configurationService.getConfigurationFor(reconciler);
+    final var controllerConfiguration =
+        ConfigurationServiceProvider.instance().getConfigurationFor(reconciler);
     var configToOverride = ControllerConfigurationOverrider.override(controllerConfiguration);
     configOverrider.accept(configToOverride);
     register(reconciler, configToOverride.build());

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/AbstractConfigurationService.java

@@ -26,6 +26,7 @@ protected <R extends HasMetadata> void replace(ControllerConfiguration<R> config
     put(config, false);
   }
 
+  @SuppressWarnings("unchecked")
   private <R extends HasMetadata> void put(
       ControllerConfiguration<R> config, boolean failIfExisting) {
     final var name = config.getName();
@@ -36,7 +37,6 @@ private <R extends HasMetadata> void put(
       }
     }
     configurations.put(name, config);
-    config.setConfigurationService(this);
   }
 
   protected <R extends HasMetadata> void throwExceptionOnNameCollision(
@@ -50,6 +50,7 @@ protected <R extends HasMetadata> void throwExceptionOnNameCollision(
             + newReconcilerClassName);
   }
 
+  @SuppressWarnings("unchecked")
   @Override
   public <R extends HasMetadata> ControllerConfiguration<R> getConfigurationFor(
       Reconciler<R> reconciler) {