feat: dependent resource inherits namespaces from controller config (#1020)

Author: csviri

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

@@ -105,7 +105,8 @@ public InformerConfiguration<R, P> build() {
 
   static <R extends HasMetadata, P extends HasMetadata> InformerConfigurationBuilder<R, P> from(
       EventSourceContext<P> context, Class<R> resourceClass) {
-    return new InformerConfigurationBuilder<>(resourceClass, context.getConfigurationService());
+    return new InformerConfigurationBuilder<>(resourceClass, context.getControllerConfiguration()
+        .getConfigurationService());
   }
 
   static InformerConfigurationBuilder from(ConfigurationService configurationService,

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Context.java

@@ -2,10 +2,11 @@
 
 import java.util.Optional;
 
-import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ManagedDependentResourceContext;
 
-public interface Context {
+public interface Context<P extends HasMetadata> {
 
   Optional<RetryInfo> getRetryInfo();
 
@@ -15,7 +16,7 @@ default <T> Optional<T> getSecondaryResource(Class<T> expectedType) {
 
   <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventSourceName);
 
-  ConfigurationService getConfigurationService();
+  ControllerConfiguration<P> getControllerConfiguration();
 
   ManagedDependentResourceContext managedDependentResourceContext();
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java

@@ -3,23 +3,23 @@
 import java.util.Optional;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.ManagedDependentResourceContext;
 import io.javaoperatorsdk.operator.processing.Controller;
 
-public class DefaultContext<P extends HasMetadata> implements Context {
+public class DefaultContext<P extends HasMetadata> implements Context<P> {
 
   private final RetryInfo retryInfo;
   private final Controller<P> controller;
   private final P primaryResource;
-  private final ConfigurationService configurationService;
+  private final ControllerConfiguration<P> controllerConfiguration;
   private ManagedDependentResourceContext managedDependentResourceContext;
 
   public DefaultContext(RetryInfo retryInfo, Controller<P> controller, P primaryResource) {
     this.retryInfo = retryInfo;
     this.controller = controller;
     this.primaryResource = primaryResource;
-    this.configurationService = controller.getConfiguration().getConfigurationService();
+    this.controllerConfiguration = controller.getConfiguration();
     this.managedDependentResourceContext = new ManagedDependentResourceContext(
         controller.getDependents());
   }
@@ -37,8 +37,8 @@ public <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventS
   }
 
   @Override
-  public ConfigurationService getConfigurationService() {
-    return configurationService;
+  public ControllerConfiguration<P> getControllerConfiguration() {
+    return controllerConfiguration;
   }
 
   public ManagedDependentResourceContext managedDependentResourceContext() {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/EventSourceContext.java

@@ -2,7 +2,7 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.fabric8.kubernetes.client.KubernetesClient;
-import io.javaoperatorsdk.operator.api.config.ConfigurationService;
+import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.processing.event.source.ResourceCache;
 
@@ -14,13 +14,14 @@
 public class EventSourceContext<P extends HasMetadata> {
 
   private final ResourceCache<P> primaryCache;
-  private final ConfigurationService configurationService;
+  private final ControllerConfiguration<P> controllerConfiguration;
   private final KubernetesClient client;
 
   public EventSourceContext(ResourceCache<P> primaryCache,
-      ConfigurationService configurationService, KubernetesClient client) {
+      ControllerConfiguration<P> controllerConfiguration,
+      KubernetesClient client) {
     this.primaryCache = primaryCache;
-    this.configurationService = configurationService;
+    this.controllerConfiguration = controllerConfiguration;
     this.client = client;
   }
 
@@ -34,16 +35,13 @@ public ResourceCache<P> getPrimaryCache() {
   }
 
   /**
-   * Retrieves the {@link ConfigurationService} associated with the operator. This allows, in
-   * particular, to lookup global configuration information such as the configured
-   * {@link io.javaoperatorsdk.operator.api.monitoring.Metrics} or
-   * {@link io.javaoperatorsdk.operator.api.config.Cloner} implementations, which could be useful to
-   * event sources.
+   * Retrieves the {@link ControllerConfiguration} associated with the operator. This allows, in
+   * particular, to lookup controller and global configuration information such as the configured*
    *
-   * @return the {@link ConfigurationService} associated with the operator
+   * @return the {@link ControllerConfiguration} associated with the operator
    */
-  public ConfigurationService getConfigurationService() {
-    return configurationService;
+  public ControllerConfiguration<P> getControllerConfiguration() {
+    return controllerConfiguration;
   }
 
   /**

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Reconciler.java

@@ -13,7 +13,7 @@ public interface Reconciler<R extends HasMetadata> {
    * @return UpdateControl to manage updates on the custom resource (usually the status) after
    *         reconciliation.
    */
-  UpdateControl<R> reconcile(R resource, Context context);
+  UpdateControl<R> reconcile(R resource, Context<R> context);
 
   /**
    * Note that this method is used in combination with finalizers. If automatic finalizer handling
@@ -37,7 +37,7 @@ public interface Reconciler<R extends HasMetadata> {
    *         finalizer to indicate that the resource should not be deleted after all, in which case
    *         the controller should restore the resource's state appropriately.
    */
-  default DeleteControl cleanup(R resource, Context context) {
+  default DeleteControl cleanup(R resource, Context<R> context) {
     return DeleteControl.defaultDelete();
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/AbstractDependentResource.java

@@ -36,7 +36,7 @@ public AbstractDependentResource() {
   }
 
   @Override
-  public void reconcile(P primary, Context context) {
+  public void reconcile(P primary, Context<P> context) {
     final var creatable = isCreatable(primary, context);
     final var updatable = isUpdatable(primary, context);
     if (creatable || updatable) {
@@ -67,7 +67,7 @@ public void reconcile(P primary, Context context) {
     }
   }
 
-  protected void handleCreate(R desired, P primary, Context context) {
+  protected void handleCreate(R desired, P primary, Context<P> context) {
     ResourceID resourceID = ResourceID.fromResource(primary);
     R created = null;
     try {
@@ -107,7 +107,7 @@ private void prepareEventFiltering(R desired, ResourceID resourceID) {
     }
   }
 
-  protected void handleUpdate(R actual, R desired, P primary, Context context) {
+  protected void handleUpdate(R actual, R desired, P primary, Context<P> context) {
     ResourceID resourceID = ResourceID.fromResource(primary);
     R updated = null;
     try {
@@ -131,29 +131,29 @@ private RecentOperationCacheFiller<R> eventSourceAsRecentOperationCacheFiller()
   }
 
   @Override
-  public void cleanup(P primary, Context context) {
+  public void cleanup(P primary, Context<P> context) {
     if (isDeletable(primary, context)) {
       deleter.delete(primary, context);
     }
   }
 
-  protected R desired(P primary, Context context) {
+  protected R desired(P primary, Context<P> context) {
     throw new IllegalStateException(
         "desired method must be implemented if this DependentResource can be created and/or updated");
   }
 
   @SuppressWarnings("unused")
-  protected boolean isCreatable(P primary, Context context) {
+  protected boolean isCreatable(P primary, Context<P> context) {
     return creatable;
   }
 
   @SuppressWarnings("unused")
-  protected boolean isUpdatable(P primary, Context context) {
+  protected boolean isUpdatable(P primary, Context<P> context) {
     return updatable;
   }
 
   @SuppressWarnings("unused")
-  protected boolean isDeletable(P primary, Context context) {
+  protected boolean isDeletable(P primary, Context<P> context) {
     return deletable;
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Creator.java

@@ -5,5 +5,5 @@
 
 @FunctionalInterface
 public interface Creator<R, P extends HasMetadata> {
-  R create(R desired, P primary, Context context);
+  R create(R desired, P primary, Context<P> context);
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/Deleter.java

@@ -5,5 +5,5 @@
 
 @FunctionalInterface
 public interface Deleter<P extends HasMetadata> {
-  void delete(P primary, Context context);
+  void delete(P primary, Context<P> context);
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/DependentResource.java

@@ -6,9 +6,9 @@
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 
 public interface DependentResource<R, P extends HasMetadata> {
-  void reconcile(P primary, Context context);
+  void reconcile(P primary, Context<P> context);
 
-  default void cleanup(P primary, Context context) {}
+  default void cleanup(P primary, Context<P> context) {}
 
   Optional<R> getResource(P primaryResource);
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/dependent/DesiredEqualsMatcher.java

@@ -12,7 +12,7 @@ public DesiredEqualsMatcher(AbstractDependentResource<R, P> abstractDependentRes
   }
 
   @Override
-  public Result<R> match(R actualResource, P primary, Context context) {
+  public Result<R> match(R actualResource, P primary, Context<P> context) {
     var desired = abstractDependentResource.desired(primary, context);
     return Result.computed(actualResource.equals(desired), desired);
   }