wip

Author: csviri

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

@@ -7,7 +7,6 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
-import java.util.function.UnaryOperator;
 import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
@@ -144,8 +143,6 @@ protected <P extends HasMetadata> ControllerConfiguration<P> configFor(Reconcile
             Utils.contextFor(name, null, null)),
         Utils.instantiate(annotation.genericFilter(), GenericFilter.class,
             Utils.contextFor(name, null, null)),
-        Utils.instantiate(annotation.cachePruneFunction(), UnaryOperator.class,
-            Utils.contextFor(name, null, null)),
         Set.of(valueOrDefault(annotation,
             io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration::namespaces,
             DEFAULT_NAMESPACES_SET.toArray(String[]::new))),

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

@@ -6,7 +6,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.UnaryOperator;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
@@ -36,7 +35,6 @@ public class ControllerConfigurationOverrider<R extends HasMetadata> {
   private OnUpdateFilter<R> onUpdateFilter;
   private GenericFilter<R> genericFilter;
   private RateLimiter rateLimiter;
-  private UnaryOperator<R> cachePruneFunction;
   private Map<DependentResourceSpec, Object> configurations;
 
   private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
@@ -52,7 +50,6 @@ private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
     this.genericFilter = original.genericFilter().orElse(null);
     this.original = original;
     this.rateLimiter = original.getRateLimiter();
-    this.cachePruneFunction = original.cachePruneFunction().orElse(null);
   }
 
   public ControllerConfigurationOverrider<R> withFinalizer(String finalizer) {
@@ -155,12 +152,6 @@ public ControllerConfigurationOverrider<R> withGenericFilter(GenericFilter<R> ge
     return this;
   }
 
-  public ControllerConfigurationOverrider<R> withCachePruneFunction(
-      UnaryOperator<R> cachePruneFunction) {
-    this.cachePruneFunction = cachePruneFunction;
-    return this;
-  }
-
   public ControllerConfigurationOverrider<R> replacingNamedDependentResourceConfig(String name,
       Object dependentResourceConfig) {
 
@@ -182,7 +173,7 @@ public ControllerConfiguration<R> build() {
     final var overridden = new ResolvedControllerConfiguration<>(
         original.getResourceClass(), original.getName(),
         generationAware, original.getAssociatedReconcilerClassName(), retry, rateLimiter,
-        reconciliationMaxInterval, onAddFilter, onUpdateFilter, genericFilter, cachePruneFunction,
+        reconciliationMaxInterval, onAddFilter, onUpdateFilter, genericFilter,
         original.getDependentResources(),
         namespaces, finalizer, labelSelector, configurations);
     overridden.setEventFilter(customResourcePredicate);

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

@@ -2,7 +2,6 @@
 
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.UnaryOperator;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
@@ -20,12 +19,10 @@ public class DefaultResourceConfiguration<R extends HasMetadata>
   private final GenericFilter<R> genericFilter;
   private final String labelSelector;
   private final Set<String> namespaces;
-  private final UnaryOperator<R> cachePruneFunction;
 
   protected DefaultResourceConfiguration(Class<R> resourceClass,
       Set<String> namespaces, String labelSelector, OnAddFilter<R> onAddFilter,
-      OnUpdateFilter<R> onUpdateFilter, GenericFilter<R> genericFilter,
-      UnaryOperator<R> cachePruneFunction) {
+      OnUpdateFilter<R> onUpdateFilter, GenericFilter<R> genericFilter) {
     this.resourceClass = resourceClass;
     this.resourceTypeName = ReconcilerUtils.getResourceTypeName(resourceClass);
     this.onAddFilter = onAddFilter;
@@ -34,7 +31,6 @@ protected DefaultResourceConfiguration(Class<R> resourceClass,
 
     this.namespaces = ResourceConfiguration.ensureValidNamespaces(namespaces);
     this.labelSelector = ResourceConfiguration.ensureValidLabelSelector(labelSelector);
-    this.cachePruneFunction = cachePruneFunction;
   }
 
   @Override
@@ -52,11 +48,6 @@ public Set<String> getNamespaces() {
     return namespaces;
   }
 
-  @Override
-  public Optional<UnaryOperator<R>> cachePruneFunction() {
-    return Optional.ofNullable(this.cachePruneFunction);
-  }
-
   @Override
   public Class<R> getResourceClass() {
     return resourceClass;

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

@@ -1,13 +1,8 @@
 package io.javaoperatorsdk.operator.api.config;
 
 import java.time.Duration;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.function.UnaryOperator;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceConfigurationProvider;
@@ -43,7 +38,7 @@ public ResolvedControllerConfiguration(Class<P> resourceClass, ControllerConfigu
         other.getAssociatedReconcilerClassName(), other.getRetry(), other.getRateLimiter(),
         other.maxReconciliationInterval().orElse(null),
         other.onAddFilter().orElse(null), other.onUpdateFilter().orElse(null),
-        other.genericFilter().orElse(null), other.cachePruneFunction().orElse(null),
+        other.genericFilter().orElse(null),
         other.getDependentResources(), other.getNamespaces(),
         other.getFinalizerName(), other.getLabelSelector(), Collections.emptyMap());
   }
@@ -69,12 +64,12 @@ public ResolvedControllerConfiguration(Class<P> resourceClass, String name,
       boolean generationAware, String associatedReconcilerClassName, Retry retry,
       RateLimiter rateLimiter, Duration maxReconciliationInterval,
       OnAddFilter<P> onAddFilter, OnUpdateFilter<P> onUpdateFilter,
-      GenericFilter<P> genericFilter, UnaryOperator<P> cachePruneFunction,
+      GenericFilter<P> genericFilter,
       List<DependentResourceSpec> dependentResources,
       Set<String> namespaces, String finalizer, String labelSelector,
       Map<DependentResourceSpec, Object> configurations) {
     this(resourceClass, name, generationAware, associatedReconcilerClassName, retry, rateLimiter,
-        maxReconciliationInterval, onAddFilter, onUpdateFilter, genericFilter, cachePruneFunction,
+        maxReconciliationInterval, onAddFilter, onUpdateFilter, genericFilter,
         namespaces, finalizer, labelSelector, configurations);
     setDependentResources(dependentResources);
   }
@@ -83,11 +78,9 @@ protected ResolvedControllerConfiguration(Class<P> resourceClass, String name,
       boolean generationAware, String associatedReconcilerClassName, Retry retry,
       RateLimiter rateLimiter, Duration maxReconciliationInterval,
       OnAddFilter<P> onAddFilter, OnUpdateFilter<P> onUpdateFilter, GenericFilter<P> genericFilter,
-      UnaryOperator<P> cachePruneFunction,
       Set<String> namespaces, String finalizer, String labelSelector,
       Map<DependentResourceSpec, Object> configurations) {
-    super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter,
-        cachePruneFunction);
+    super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter);
     this.name = ControllerConfiguration.ensureValidName(name, associatedReconcilerClassName);
     this.generationAware = generationAware;
     this.associatedReconcilerClassName = associatedReconcilerClassName;

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

@@ -4,13 +4,11 @@
 import java.util.Collections;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.UnaryOperator;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.ReconcilerUtils;
 import io.javaoperatorsdk.operator.api.reconciler.Constants;
-import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
 import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
@@ -124,11 +122,4 @@ default Set<String> getEffectiveNamespaces() {
     }
     return targetNamespaces;
   }
-
-  /**
-   * See {@link ControllerConfiguration#cachePruneFunction()} for details.
-   */
-  default Optional<UnaryOperator<R>> cachePruneFunction() {
-    return Optional.empty();
-  }
 }

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

@@ -3,7 +3,6 @@
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
-import java.util.function.UnaryOperator;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.DefaultResourceConfiguration;
@@ -39,10 +38,8 @@ protected DefaultInformerConfiguration(String labelSelector,
         OnAddFilter<R> onAddFilter,
         OnUpdateFilter<R> onUpdateFilter,
         OnDeleteFilter<R> onDeleteFilter,
-        GenericFilter<R> genericFilter,
-        UnaryOperator<R> cachePruneFunction) {
-      super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter,
-          cachePruneFunction);
+        GenericFilter<R> genericFilter) {
+      super(resourceClass, namespaces, labelSelector, onAddFilter, onUpdateFilter, genericFilter);
       this.followControllerNamespaceChanges = followControllerNamespaceChanges;
 
       this.primaryToSecondaryMapper = primaryToSecondaryMapper;
@@ -106,7 +103,6 @@ class InformerConfigurationBuilder<R extends HasMetadata> {
     private OnDeleteFilter<R> onDeleteFilter;
     private GenericFilter<R> genericFilter;
     private boolean inheritControllerNamespacesOnChange = false;
-    private UnaryOperator<R> cachePruneFunction;
 
     private InformerConfigurationBuilder(Class<R> resourceClass) {
       this.resourceClass = resourceClass;
@@ -207,18 +203,12 @@ public InformerConfigurationBuilder<R> withGenericFilter(GenericFilter<R> generi
       return this;
     }
 
-    public InformerConfigurationBuilder<R> withCachePruneFunction(
-        UnaryOperator<R> cachePruneFunction) {
-      this.cachePruneFunction = cachePruneFunction;
-      return this;
-    }
-
     public InformerConfiguration<R> build() {
       return new DefaultInformerConfiguration<>(labelSelector, resourceClass,
           primaryToSecondaryMapper,
           secondaryToPrimaryMapper,
           namespaces, inheritControllerNamespacesOnChange, onAddFilter, onUpdateFilter,
-          onDeleteFilter, genericFilter, cachePruneFunction);
+          onDeleteFilter, genericFilter);
     }
   }
 

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

@@ -5,7 +5,6 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.function.UnaryOperator;
 
 import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
 import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
@@ -119,25 +118,4 @@ MaxReconciliationInterval maxReconciliationInterval() default @MaxReconciliation
    *         accessible no-arg constructor.
    */
   Class<? extends RateLimiter> rateLimiter() default LinearRateLimiter.class;
-
-  /**
-   * <p>
-   * <b>This is an experimental feature, might be a subject of change and even removal in the
-   * future.</b>
-   * </p>
-   * <p>
-   * In order to optimize cache, thus set null on some attributes, this function can be set. Note
-   * that this has subtle implications how updates on the resources should be handled. Notably only
-   * patching of the resource can be used from that point, since update would remove not cached
-   * parts of the resource.
-   * </p>
-   * <p>
-   * Note that this feature does not work with Dependent Resources.
-   * </p>
-   *
-   *
-   *
-   * @return function to remove parts of the resource.
-   */
-  Class<? extends UnaryOperator> cachePruneFunction() default UnaryOperator.class;
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

@@ -10,8 +10,6 @@
 import io.fabric8.kubernetes.client.KubernetesClientException;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.kubernetes.client.dsl.base.PatchContext;
-import io.fabric8.kubernetes.client.dsl.base.PatchType;
 import io.javaoperatorsdk.operator.OperatorException;
 import io.javaoperatorsdk.operator.api.ObservedGenerationAware;
 import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
@@ -372,13 +370,6 @@ public R getResource(String namespace, String name) {
       }
     }
 
-    public R serverSideApplyLockResource(R resource, R originalResource) {
-      var patchContext = PatchContext.of(PatchType.SERVER_SIDE_APPLY);
-      patchContext.setForce(true);
-      return resource(originalResource).patch(patchContext,
-          resource);
-    }
-
     public R updateResource(R resource) {
       log.debug(
           "Trying to replace resource {}, version: {}",

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

@@ -113,8 +113,6 @@ private InformerWrapper<T> createEventSource(
       FilterWatchListDeletable<T, KubernetesResourceList<T>, Resource<T>> filteredBySelectorClient,
       ResourceEventHandler<T> eventHandler, String namespaceIdentifier) {
     var informer = filteredBySelectorClient.runnableInformer(0);
-    configuration.cachePruneFunction()
-        .ifPresent(f -> informer.itemStore(new TransformingItemStore<>(f)));
     var source =
         new InformerWrapper<>(informer, namespaceIdentifier);
     source.addEventHandler(eventHandler);

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

@@ -43,8 +43,7 @@ public abstract class ManagedInformerEventSource<R extends HasMetadata, P extend
   protected ManagedInformerEventSource(
       MixedOperation<R, KubernetesResourceList<R>, Resource<R>> client, C configuration) {
     super(configuration.getResourceClass());
-    temporaryResourceCache = new TemporaryResourceCache<>(this,
-        configuration.cachePruneFunction().orElse(null));
+    temporaryResourceCache = new TemporaryResourceCache<>(this);
     manager().initSources(client, configuration, this);
     this.configuration = configuration;
   }

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

@@ -3,7 +3,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.UnaryOperator;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -35,14 +34,11 @@ public class TemporaryResourceCache<T extends HasMetadata> {
 
   private static final Logger log = LoggerFactory.getLogger(TemporaryResourceCache.class);
 
-  private UnaryOperator<T> cachePruneFunction;
   private final Map<ResourceID, T> cache = new ConcurrentHashMap<>();
   private final ManagedInformerEventSource<T, ?, ?> managedInformerEventSource;
 
-  public TemporaryResourceCache(ManagedInformerEventSource<T, ?, ?> managedInformerEventSource,
-      UnaryOperator<T> cachePruneFunction) {
+  public TemporaryResourceCache(ManagedInformerEventSource<T, ?, ?> managedInformerEventSource) {
     this.managedInformerEventSource = managedInformerEventSource;
-    this.cachePruneFunction = cachePruneFunction;
   }
 
   public synchronized void removeResourceFromCache(T resource) {
@@ -83,9 +79,6 @@ public synchronized void putUpdatedResource(T newResource, String previousResour
   }
 
   private void putToCache(T resource, ResourceID resourceID) {
-    if (cachePruneFunction != null) {
-      resource = cachePruneFunction.apply(resource);
-    }
     cache.put(resourceID == null ? ResourceID.fromResource(resource) : resourceID, resource);
   }