wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java

@@ -47,13 +47,14 @@ public class LocallyRunOperatorExtension extends AbstractOperatorExtension {
   private static final boolean deleteCRDs =
       Boolean.parseBoolean(System.getProperty("testsuite.deleteCRDs", "true"));
 
-  private final Operator operator;
+  private Operator operator;
   private final List<ReconcilerSpec> reconcilers;
   private final List<PortForwardSpec> portForwards;
   private final List<LocalPortForward> localPortForwards;
   private final List<Class<? extends CustomResource>> additionalCustomResourceDefinitions;
   private final Map<Reconciler, RegisteredController> registeredControllers;
   private final Map<String, String> crdMappings;
+  private final Consumer<ConfigurationServiceOverrider> configurationServiceOverrider;
 
   private LocallyRunOperatorExtension(
       List<ReconcilerSpec> reconcilers,
@@ -82,12 +83,13 @@ private LocallyRunOperatorExtension(
     this.portForwards = portForwards;
     this.localPortForwards = new ArrayList<>(portForwards.size());
     this.additionalCustomResourceDefinitions = additionalCustomResourceDefinitions;
-    configurationServiceOverrider =
+    this.configurationServiceOverrider =
         configurationServiceOverrider != null
             ? configurationServiceOverrider.andThen(
-                overrider -> overrider.withKubernetesClient(kubernetesClient))
-            : overrider -> overrider.withKubernetesClient(kubernetesClient);
-    this.operator = new Operator(configurationServiceOverrider);
+                overrider ->
+                    overrider.withKubernetesClient(kubernetesClient).withCloseClientOnStop(false))
+            : (o -> o.withKubernetesClient(kubernetesClient).withCloseClientOnStop(false));
+
     this.registeredControllers = new HashMap<>();
     crdMappings = getAdditionalCRDsFromFiles(additionalCrds, getKubernetesClient());
   }
@@ -261,6 +263,7 @@ protected void before(ExtensionContext context) {
 
     additionalCustomResourceDefinitions.forEach(this::applyCrd);
     for (var ref : reconcilers) {
+      this.operator = new Operator(configurationServiceOverrider);
       final var config = operator.getConfigurationService().getConfigurationFor(ref.reconciler);
       final var oconfig = override(config);
 
@@ -314,8 +317,6 @@ protected void after(ExtensionContext context) {
       iterator.remove();
     }
 
-    kubernetesClient.close();
-
     try {
       this.operator.stop();
     } catch (Exception e) {

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primaryindexer/PrimaryIndexerIT.java

@@ -18,8 +18,7 @@ public class PrimaryIndexerIT {
   public static final String RESOURCE_NAME1 = "test1";
   public static final String RESOURCE_NAME2 = "test2";
 
-  @RegisterExtension
-  LocallyRunOperatorExtension extension = buildOperator();
+  @RegisterExtension LocallyRunOperatorExtension extension = buildOperator();
 
   protected LocallyRunOperatorExtension buildOperator() {
     return LocallyRunOperatorExtension.builder()

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/subresource/SubResourceUpdateIT.java

@@ -23,6 +23,7 @@ class SubResourceUpdateIT {
   static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(SubResourceTestCustomReconciler.class)
+          .withConfigurationService(o -> o.withCloseClientOnStop(false))
           .build();
 
   @Test