refactor: remove now unneeded KubernetesClientAware

Signed-off-by: Chris Laprun <claprun@redhat.com>

Author: metacosm

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

@@ -65,14 +65,13 @@ public void delete(P primary, Context<P> context) {
   @SuppressWarnings({"unchecked", "unused"})
   private void handleExplicitStateDelete(P primary, R secondary, Context<P> context) {
     var res = dependentResourceWithExplicitState.stateResource(primary, secondary);
-    dependentResourceWithExplicitState.getKubernetesClient().resource(res).delete();
+    context.getClient().resource(res).delete();
   }
 
   @SuppressWarnings({"rawtypes", "unchecked", "unused"})
   protected void handleExplicitStateCreation(P primary, R created, Context<P> context) {
     var resource = dependentResourceWithExplicitState.stateResource(primary, created);
-    var stateResource =
-        dependentResourceWithExplicitState.getKubernetesClient().resource(resource).create();
+    var stateResource = context.getClient().resource(resource).create();
     if (externalStateEventSource != null) {
       ((RecentOperationCacheFiller) externalStateEventSource)
           .handleRecentResourceCreate(ResourceID.fromResource(primary), stateResource);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/AbstractExternalDependentResource.java

@@ -4,7 +4,6 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.KubernetesClientAware;
 
 /**
  * Handles external resources where in order to address the resource additional information or
@@ -14,7 +13,7 @@
  * for a resource that extends {@link AbstractExternalDependentResource}.
  */
 public interface DependentResourceWithExplicitState<R, P extends HasMetadata, S extends HasMetadata>
-    extends Creator<R, P>, Deleter<P>, KubernetesClientAware {
+    extends Creator<R, P>, Deleter<P> {
 
   /**
    * Only needs to be implemented if multiple event sources are present for the target resource

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/DependentResourceWithExplicitState.java

@@ -8,7 +8,6 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.fabric8.kubernetes.client.dsl.Resource;
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.api.config.dependent.Configured;
@@ -19,7 +18,6 @@
 import io.javaoperatorsdk.operator.api.reconciler.Ignore;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.GarbageCollected;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.KubernetesClientAware;
 import io.javaoperatorsdk.operator.processing.dependent.AbstractEventSourceHolderDependentResource;
 import io.javaoperatorsdk.operator.processing.dependent.Matcher.Result;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.updatermatcher.GenericResourceUpdaterMatcher;
@@ -33,17 +31,16 @@
     converter = KubernetesDependentConverter.class)
 public abstract class KubernetesDependentResource<R extends HasMetadata, P extends HasMetadata>
     extends AbstractEventSourceHolderDependentResource<R, P, InformerEventSource<R, P>>
-    implements KubernetesClientAware,
-    DependentResourceConfigurator<KubernetesDependentResourceConfig<R>> {
+    implements DependentResourceConfigurator<KubernetesDependentResourceConfig<R>> {
 
   private static final Logger log = LoggerFactory.getLogger(KubernetesDependentResource.class);
 
-  protected KubernetesClient client;
+  // protected KubernetesClient client;
   private final ResourceUpdaterMatcher<R> updaterMatcher;
   private final boolean garbageCollected = this instanceof GarbageCollected;
   private KubernetesDependentResourceConfig<R> kubernetesDependentResourceConfig;
 
-  private boolean usingCustomResourceUpdateMatcher;
+  private final boolean usingCustomResourceUpdateMatcher;
 
   @SuppressWarnings("unchecked")
   public KubernetesDependentResource(Class<R> resourceType) {
@@ -117,7 +114,7 @@ public R create(R desired, P primary, Context<P> context) {
       }
     }
     addMetadata(false, null, desired, primary, context);
-    final var resource = prepare(desired, primary, "Creating");
+    final var resource = prepare(context, desired, primary, "Creating");
     return useSSA(context)
         ? resource
             .fieldManager(context.getControllerConfiguration().fieldManager())
@@ -134,12 +131,12 @@ public R update(R actual, R desired, P primary, Context<P> context) {
     R updatedResource;
     addMetadata(false, actual, desired, primary, context);
     if (useSSA(context)) {
-      updatedResource = prepare(desired, primary, "Updating")
+      updatedResource = prepare(context, desired, primary, "Updating")
           .fieldManager(context.getControllerConfiguration().fieldManager())
           .forceConflicts().serverSideApply();
     } else {
       var updatedActual = updaterMatcher.updateResource(actual, desired, context);
-      updatedResource = prepare(updatedActual, primary, "Updating").update();
+      updatedResource = prepare(context, updatedActual, primary, "Updating").update();
     }
     log.debug("Resource version after update: {}",
         updatedResource.getMetadata().getResourceVersion());
@@ -216,23 +213,23 @@ private boolean usePreviousAnnotation(Context<P> context) {
   @Override
   protected void handleDelete(P primary, R secondary, Context<P> context) {
     if (secondary != null) {
-      client.resource(secondary).delete();
+      context.getClient().resource(secondary).delete();
     }
   }
 
   @SuppressWarnings("unused")
   public void deleteTargetResource(P primary, R resource, String key, Context<P> context) {
-    client.resource(resource).delete();
+    context.getClient().resource(resource).delete();
   }
 
   @SuppressWarnings("unused")
-  protected Resource<R> prepare(R desired, P primary, String actionName) {
+  protected Resource<R> prepare(Context<P> context, R desired, P primary, String actionName) {
     log.debug("{} target resource with type: {}, with id: {}",
         actionName,
         desired.getClass(),
         ResourceID.fromResource(desired));
 
-    return client.resource(desired);
+    return context.getClient().resource(desired);
   }
 
   protected void addReferenceHandlingMetadata(R desired, P primary) {
@@ -292,16 +289,6 @@ protected boolean addOwnerReference() {
     return garbageCollected;
   }
 
-  @Override
-  public void setKubernetesClient(KubernetesClient kubernetesClient) {
-    this.client = kubernetesClient;
-  }
-
-  @Override
-  public KubernetesClient getKubernetesClient() {
-    return client;
-  }
-
   @Override
   protected R desired(P primary, Context<P> context) {
     return super.desired(primary, context);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

@@ -12,7 +12,6 @@
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.EventSourceReferencer;
-import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.KubernetesClientAware;
 
 import static io.javaoperatorsdk.operator.processing.dependent.workflow.Workflow.THROW_EXCEPTION_AUTOMATICALLY_DEFAULT;
 
@@ -103,10 +102,6 @@ private <R> DependentResource<R, P> resolve(DependentResourceSpec<R, P> spec,
         configuration.getConfigurationService().dependentResourceFactory()
             .createFrom(spec, configuration);
 
-    if (dependentResource instanceof KubernetesClientAware) {
-      ((KubernetesClientAware) dependentResource).setKubernetesClient(client);
-    }
-
     spec.getUseEventSourceWithName()
         .ifPresent(esName -> {
           if (dependentResource instanceof EventSourceReferencer) {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultManagedWorkflow.java

@@ -37,7 +37,6 @@ public abstract class ManagedInformerEventSource<R extends HasMetadata, P extend
 
   private static final Logger log = LoggerFactory.getLogger(ManagedInformerEventSource.class);
   private final InformerManager<R, C> cache;
-
   protected TemporaryResourceCache<R> temporaryResourceCache;
   protected MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client;
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java

@@ -31,7 +31,7 @@ private static void startEndStopOperator(KubernetesClient client,
     Operator o1 = new Operator(o -> o
         .withCloseClientOnStop(false)
         .withKubernetesClient(client));
-    o1.register(new DependentReInitializationReconciler(dependent, client));
+    o1.register(new DependentReInitializationReconciler(dependent));
     o1.start();
     o1.stop();
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentReInitializationIT.java

@@ -143,10 +143,9 @@ private DependnetSSACustomResource reconcileWithLegacyOperator(Operator legacyOp
 
   private Operator createOperator(KubernetesClient client, boolean legacyDependentHandling,
       String fieldManager) {
-    Operator operator = new Operator(client,
-        o -> o.withCloseClientOnStop(false));
+    Operator operator =
+        new Operator(o -> o.withKubernetesClient(client).withCloseClientOnStop(false));
     var reconciler = new DependentSSAReconciler(!legacyDependentHandling);
-    reconciler.setKubernetesClient(client);
     operator.register(reconciler, o -> {
       o.settingNamespace(namespace);
       if (fieldManager != null) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/DependentSSAMigrationIT.java

@@ -3,21 +3,18 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.reconciler.*;
-import io.javaoperatorsdk.operator.junit.KubernetesClientAware;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
 
 @ControllerConfiguration
 public class StandaloneBulkDependentReconciler
     implements Reconciler<BulkDependentTestCustomResource>, TestExecutionInfoProvider,
-    EventSourceInitializer<BulkDependentTestCustomResource>, KubernetesClientAware {
+    EventSourceInitializer<BulkDependentTestCustomResource> {
 
   private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
   private final ConfigMapDeleterBulkDependentResource dependent;
-  private KubernetesClient kubernetesClient;
 
   public StandaloneBulkDependentReconciler() {
     dependent = new CRUDConfigMapBulkDependentResource();
@@ -44,15 +41,4 @@ public Map<String, EventSource> prepareEventSources(
     return EventSourceInitializer
         .nameEventSources(dependent.initEventSource(context));
   }
-
-  @Override
-  public KubernetesClient getKubernetesClient() {
-    return kubernetesClient;
-  }
-
-  @Override
-  public void setKubernetesClient(KubernetesClient kubernetesClient) {
-    this.kubernetesClient = kubernetesClient;
-    dependent.setKubernetesClient(kubernetesClient);
-  }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/StandaloneBulkDependentReconciler.java

@@ -7,24 +7,16 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
-import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
-import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
-import io.javaoperatorsdk.operator.api.reconciler.EventSourceInitializer;
-import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
-import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
-import io.javaoperatorsdk.operator.junit.KubernetesClientAware;
+import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 
 @ControllerConfiguration
 public class CreateUpdateEventFilterTestReconciler
     implements Reconciler<CreateUpdateEventFilterTestCustomResource>,
-    EventSourceInitializer<CreateUpdateEventFilterTestCustomResource>,
-    KubernetesClientAware {
+    EventSourceInitializer<CreateUpdateEventFilterTestCustomResource> {
 
   private static final class DirectConfigMapDependentResource
       extends
@@ -50,7 +42,6 @@ public void setEventSource(
   }
 
   public static final String CONFIG_MAP_TEST_DATA_KEY = "key";
-  private KubernetesClient client;
   private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
   private InformerEventSource<ConfigMap, CreateUpdateEventFilterTestCustomResource> informerEventSource;
   private DirectConfigMapDependentResource configMapDR =
@@ -63,7 +54,7 @@ public UpdateControl<CreateUpdateEventFilterTestCustomResource> reconcile(
     numberOfExecutions.incrementAndGet();
 
     ConfigMap configMap =
-        client
+        context.getClient()
             .configMaps()
             .inNamespace(resource.getMetadata().getNamespace())
             .withName(resource.getMetadata().getName())
@@ -103,25 +94,12 @@ public Map<String, EventSource> prepareEventSources(
         InformerConfiguration.from(ConfigMap.class)
             .withLabelSelector("integrationtest = " + this.getClass().getSimpleName())
             .build();
-    informerEventSource =
-        new InformerEventSource<>(informerConfiguration, client);
-
-    this.configMapDR.setKubernetesClient(context.getClient());
+    informerEventSource = new InformerEventSource<>(informerConfiguration, context.getClient());
     this.configMapDR.setEventSource(informerEventSource);
 
     return EventSourceInitializer.nameEventSources(informerEventSource);
   }
 
-  @Override
-  public KubernetesClient getKubernetesClient() {
-    return client;
-  }
-
-  @Override
-  public void setKubernetesClient(KubernetesClient kubernetesClient) {
-    this.client = kubernetesClient;
-  }
-
   public int getNumberOfExecutions() {
     return numberOfExecutions.get();
   }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java

@@ -2,7 +2,6 @@
 
 import java.util.Map;
 
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.reconciler.*;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 
@@ -13,10 +12,8 @@ public class DependentReInitializationReconciler
 
   private final ConfigMapDependentResource configMapDependentResource;
 
-  public DependentReInitializationReconciler(ConfigMapDependentResource dependentResource,
-      KubernetesClient client) {
+  public DependentReInitializationReconciler(ConfigMapDependentResource dependentResource) {
     this.configMapDependentResource = dependentResource;
-    this.configMapDependentResource.setKubernetesClient(client);
   }
 
   @Override

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentreinitialization/DependentReInitializationReconciler.java

@@ -4,23 +4,19 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
-import io.fabric8.kubernetes.client.KubernetesClient;
 import io.javaoperatorsdk.operator.api.reconciler.*;
-import io.javaoperatorsdk.operator.junit.KubernetesClientAware;
 import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfigBuilder;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
 
 @ControllerConfiguration
 public class DependentSSAReconciler
     implements Reconciler<DependnetSSACustomResource>, TestExecutionInfoProvider,
-    KubernetesClientAware,
     EventSourceInitializer<DependnetSSACustomResource> {
 
   private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
 
   private SSAConfigMapDependent ssaConfigMapDependent = new SSAConfigMapDependent();
-  private KubernetesClient kubernetesClient;
 
   public DependentSSAReconciler() {
     this(true);
@@ -46,17 +42,6 @@ public int getNumberOfExecutions() {
     return numberOfExecutions.get();
   }
 
-  @Override
-  public KubernetesClient getKubernetesClient() {
-    return kubernetesClient;
-  }
-
-  @Override
-  public void setKubernetesClient(KubernetesClient kubernetesClient) {
-    this.kubernetesClient = kubernetesClient;
-    ssaConfigMapDependent.setKubernetesClient(kubernetesClient);
-  }
-
   @Override
   public Map<String, EventSource> prepareEventSources(
       EventSourceContext<DependnetSSACustomResource> context) {