configuration overrides

Author: csviri

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

@@ -266,8 +266,7 @@ default ExecutorServiceManager getExecutorServiceManager() {
   }
 
   // todo test transition
-  // todo configurable
-  default boolean useLegacyCreateUpdateAndMatchingOnDependentResources() {
+  default boolean legacyCreateUpdateAndMatchingForDependentResources() {
     return false;
   }
 }

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

@@ -32,6 +32,7 @@ public class ConfigurationServiceOverrider {
   private Boolean stopOnInformerErrorDuringStartup;
   private Duration cacheSyncTimeout;
   private ResourceClassResolver resourceClassResolver;
+  private Boolean legacyCreateUpdateAndMatchingForDependentResources;
 
   ConfigurationServiceOverrider(ConfigurationService original) {
     this.original = original;
@@ -139,6 +140,12 @@ public ConfigurationServiceOverrider withResourceClassResolver(
     return this;
   }
 
+  public ConfigurationServiceOverrider withLegacyCreateUpdateAndMatchingForDependentResources(
+      boolean value) {
+    this.legacyCreateUpdateAndMatchingForDependentResources = value;
+    return this;
+  }
+
   public ConfigurationService build() {
     return new BaseConfigurationService(original.getVersion(), cloner, objectMapper) {
       @Override
@@ -248,6 +255,13 @@ public ResourceClassResolver getResourceClassResolver() {
         return resourceClassResolver != null ? resourceClassResolver
             : super.getResourceClassResolver();
       }
+
+      @Override
+      public boolean legacyCreateUpdateAndMatchingForDependentResources() {
+        return legacyCreateUpdateAndMatchingForDependentResources != null
+            ? legacyCreateUpdateAndMatchingForDependentResources
+            : super.legacyCreateUpdateAndMatchingForDependentResources();
+      }
     };
   }
 

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

@@ -125,7 +125,6 @@ default Set<String> getEffectiveNamespaces() {
     return ResourceConfiguration.super.getEffectiveNamespaces(getConfigurationService());
   }
 
-  // TODO configurable
   default String dependentFieldManager() {
     return "controller";
   }

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

@@ -39,6 +39,7 @@ public class ControllerConfigurationOverrider<R extends HasMetadata> {
   private Map<DependentResourceSpec, Object> configurations;
   private ItemStore<R> itemStore;
   private String name;
+  private String dependentFieldManager;
 
   private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
     this.finalizer = original.getFinalizerName();
@@ -54,6 +55,7 @@ private ControllerConfigurationOverrider(ControllerConfiguration<R> original) {
     this.original = original;
     this.rateLimiter = original.getRateLimiter();
     this.name = original.getName();
+    this.dependentFieldManager = original.dependentFieldManager();
   }
 
   public ControllerConfigurationOverrider<R> withFinalizer(String finalizer) {
@@ -168,6 +170,12 @@ public ControllerConfigurationOverrider<R> withName(String name) {
     return this;
   }
 
+  public ControllerConfigurationOverrider<R> withDependentFieldManager(
+      String dependentFieldManager) {
+    this.dependentFieldManager = dependentFieldManager;
+    return this;
+  }
+
   public ControllerConfigurationOverrider<R> replacingNamedDependentResourceConfig(String name,
       Object dependentResourceConfig) {
 

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

@@ -136,7 +136,7 @@ protected R handleUpdate(R actual, R desired, P primary, Context<P> context) {
   @SuppressWarnings("unused")
   public R create(R target, P primary, Context<P> context) {
     if (context.getControllerConfiguration().getConfigurationService()
-        .useLegacyCreateUpdateAndMatchingOnDependentResources()) {
+        .legacyCreateUpdateAndMatchingForDependentResources()) {
       return prepare(target, primary, "Creating").create();
     } else {
       return prepare(target, primary, "Creating").patch(getSSAPatchContext(context));
@@ -145,7 +145,7 @@ public R create(R target, P primary, Context<P> context) {
 
   public R update(R actual, R target, P primary, Context<P> context) {
     if (context.getControllerConfiguration().getConfigurationService()
-        .useLegacyCreateUpdateAndMatchingOnDependentResources()) {
+        .legacyCreateUpdateAndMatchingForDependentResources()) {
       var updatedActual = processor.replaceSpecOnActual(actual, target, context);
       return prepare(updatedActual, primary, "Updating").replace();
     } else {
@@ -155,7 +155,7 @@ public R update(R actual, R target, P primary, Context<P> context) {
 
   public Result<R> match(R actualResource, P primary, Context<P> context) {
     if (context.getControllerConfiguration().getConfigurationService()
-        .useLegacyCreateUpdateAndMatchingOnDependentResources()) {
+        .legacyCreateUpdateAndMatchingForDependentResources()) {
       return GenericKubernetesResourceMatcher.match(this, actualResource, primary, context, false);
     } else {
       final var desired = desired(primary, context);

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

@@ -62,7 +62,6 @@ public boolean matches(R actual, R desired, Context<?> context) {
         managedFieldsEntry.getFieldsV1().getAdditionalProperties(), objectMapper);
     removeIrrelevantValues(desiredMap);
 
-    // todo, just copy all the fields?
     // this is kind strange fix for:
     // https://kubernetes.slack.com/archives/C0EG7JC6T/p1685706853248489
     removeOwnerRefernces(desiredMap);