feat: jenvtest parallel execution of IT

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

@@ -43,6 +43,7 @@ public abstract class AbstractOperatorExtension implements HasKubernetesClient,
   protected final boolean preserveNamespaceOnError;
   protected final boolean waitForNamespaceDeletion;
   protected final int namespaceDeleteTimeout = DEFAULT_NAMESPACE_DELETE_TIMEOUT;
+  protected final boolean clientProvided;
 
   protected String namespace;
 
@@ -53,6 +54,7 @@ protected AbstractOperatorExtension(
       boolean preserveNamespaceOnError,
       boolean waitForNamespaceDeletion,
       KubernetesClient kubernetesClient) {
+    this.clientProvided = kubernetesClient != null;
     this.kubernetesClient = kubernetesClient != null ? kubernetesClient
         : new KubernetesClientBuilder()
             .withConfig(ConfigurationServiceProvider.instance().getClientConfiguration()).build();
@@ -182,6 +184,7 @@ protected void afterAllImpl(ExtensionContext context) {
   protected void afterEachImpl(ExtensionContext context) {
     // resets the config service provider so the controller configs are reconstructed always
     ConfigurationServiceProvider.reset();
+    ConfigurationServiceProvider.overrideCurrent(c -> c.withCloseClientOnStop(!clientProvided));
     if (!oneNamespacePerClass) {
       after(context);
     }
@@ -257,6 +260,7 @@ public T oneNamespacePerClass(boolean value) {
     }
 
     public T withConfigurationService(Consumer<ConfigurationServiceOverrider> overrider) {
+      ConfigurationServiceProvider.reset();
       ConfigurationServiceProvider.overrideCurrent(overrider);
       return (T) this;
     }

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

@@ -62,7 +62,9 @@ private LocallyRunOperatorExtension(
     this.portForwards = portForwards;
     this.localPortForwards = new ArrayList<>(portForwards.size());
     this.additionalCustomResourceDefinitions = additionalCustomResourceDefinitions;
-    this.operator = new Operator(getKubernetesClient());
+    ConfigurationServiceProvider.reset();
+    this.operator =
+        new Operator(getKubernetesClient(), o -> o.withCloseClientOnStop(!clientProvided));
     this.registeredControllers = new HashMap<>();
   }
 

operator-framework/pom.xml

@@ -83,7 +83,7 @@
     </dependency>
     <dependency>
       <groupId>io.javaoperatorsdk</groupId>
-      <artifactId>jenvtest</artifactId>
+      <artifactId>jenvtest-fabric8-client-support</artifactId>
       <scope>test</scope>
     </dependency>
   </dependencies>

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

@@ -8,19 +8,26 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.Service;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.builtinresourcecleaner.ObservedGenerationTestReconciler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class BuiltInResourceCleanerIT {
 
   private static final Logger log = LoggerFactory.getLogger(BuiltInResourceCleanerIT.class);
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
           .withReconciler(new ObservedGenerationTestReconciler())
           .build();
 

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

@@ -31,7 +31,8 @@ class ChangeNamespaceIT {
 
   @RegisterExtension
   LocallyRunOperatorExtension operator =
-      LocallyRunOperatorExtension.builder().withReconciler(new ChangeNamespaceTestReconciler())
+      LocallyRunOperatorExtension.builder()
+          .withReconciler(new ChangeNamespaceTestReconciler())
           .build();
 
   @BeforeEach

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

@@ -4,20 +4,28 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.cleanerforreconciler.CleanerForReconcilerCustomResource;
 import io.javaoperatorsdk.operator.sample.cleanerforreconciler.CleanerForReconcilerTestReconciler;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class CleanerForReconcilerIT {
 
   public static final String TEST_RESOURCE_NAME = "cleaner-for-reconciler-test1";
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
-      LocallyRunOperatorExtension.builder().withReconciler(new CleanerForReconcilerTestReconciler())
+      LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
+          .withReconciler(new CleanerForReconcilerTestReconciler())
           .build();
 
 

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

@@ -6,6 +6,8 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.cleanupconflict.CleanupConflictCustomResource;
 import io.javaoperatorsdk.operator.sample.cleanupconflict.CleanupConflictReconciler;
@@ -14,14 +16,20 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class CleanupConflictIT {
 
   private static final String ADDITIONAL_FINALIZER = "javaoperatorsdk.io/additionalfinalizer";
   public static final String TEST_RESOURCE_NAME = "test1";
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
-      LocallyRunOperatorExtension.builder().withReconciler(new CleanupConflictReconciler())
+      LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
+          .withReconciler(new CleanupConflictReconciler())
           .build();
 
   @Test

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

@@ -10,6 +10,8 @@
 import org.slf4j.LoggerFactory;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 import io.javaoperatorsdk.operator.sample.simple.TestReconciler;
@@ -18,16 +20,22 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class ConcurrencyIT {
   public static final int NUMBER_OF_RESOURCES_CREATED = 50;
   public static final int NUMBER_OF_RESOURCES_DELETED = 30;
   public static final int NUMBER_OF_RESOURCES_UPDATED = 20;
   public static final String UPDATED_SUFFIX = "_updated";
   private static final Logger log = LoggerFactory.getLogger(ConcurrencyIT.class);
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
-      LocallyRunOperatorExtension.builder().withReconciler(new TestReconciler(true)).build();
+      LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
+          .withReconciler(new TestReconciler(true)).build();
 
   @Test
   void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedException {

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

@@ -7,6 +7,8 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.createupdateeventfilter.CreateUpdateEventFilterTestCustomResource;
 import io.javaoperatorsdk.operator.sample.createupdateeventfilter.CreateUpdateEventFilterTestCustomResourceSpec;
@@ -16,14 +18,19 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class CreateUpdateInformerEventSourceEventFilterIT {
 
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
           .withReconciler(new CreateUpdateEventFilterTestReconciler())
           .build();
 
+  static KubernetesClient client;
+
   @Test
   void updateEventNotReceivedAfterCreateOrUpdate() {
     CreateUpdateEventFilterTestCustomResource resource = prepareTestResource();

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

@@ -4,18 +4,26 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.customfilter.CustomFilteringTestReconciler;
 import io.javaoperatorsdk.operator.sample.customfilter.CustomFilteringTestResource;
 import io.javaoperatorsdk.operator.sample.customfilter.CustomFilteringTestResourceSpec;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+@EnableKubeAPIServer
 class CustomResourceFilterIT {
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
-      LocallyRunOperatorExtension.builder().withReconciler(new CustomFilteringTestReconciler())
+      LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
+          .withReconciler(new CustomFilteringTestReconciler())
           .build();
 
   @Test

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

@@ -4,6 +4,8 @@
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.cleanermanageddependent.CleanerForManagedDependentCustomResource;
 import io.javaoperatorsdk.operator.sample.cleanermanageddependent.CleanerForManagedDependentTestReconciler;
@@ -12,13 +14,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class DeleterForManagedDependentResourcesOnlyIT {
 
   public static final String TEST_RESOURCE_NAME = "cleaner-for-reconciler-test1";
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
           .withReconciler(new CleanerForManagedDependentTestReconciler())
           .build();
 

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

@@ -7,6 +7,8 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.dependentannotationsecondarymapper.DependentAnnotationSecondaryMapperReconciler;
 import io.javaoperatorsdk.operator.sample.dependentannotationsecondarymapper.DependentAnnotationSecondaryMapperResource;
@@ -16,13 +18,18 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class DependentAnnotationSecondaryMapperIT {
 
   public static final String TEST_RESOURCE_NAME = "test1";
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
           .withReconciler(DependentAnnotationSecondaryMapperReconciler.class)
           .build();
 

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

@@ -8,6 +8,8 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.dependentfilter.DependentFilterTestCustomResource;
 import io.javaoperatorsdk.operator.sample.dependentfilter.DependentFilterTestReconciler;
@@ -18,13 +20,19 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class DependentFilterIT {
 
   public static final String RESOURCE_NAME = "test1";
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
-      LocallyRunOperatorExtension.builder().withReconciler(DependentFilterTestReconciler.class)
+      LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
+          .withReconciler(DependentFilterTestReconciler.class)
           .build();
 
   @Test

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

@@ -7,6 +7,8 @@
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ObjectMeta;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.dependentoperationeventfiltering.ConfigMapDependentResource;
 import io.javaoperatorsdk.operator.sample.dependentoperationeventfiltering.DependentOperationEventFilterCustomResource;
@@ -16,15 +18,20 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.awaitility.Awaitility.await;
 
+@EnableKubeAPIServer
 class DependentOperationEventFilterIT {
 
   public static final String TEST = "test";
   public static final String SPEC_VAL_1 = "val1";
   public static final String SPEC_VAL_2 = "val2";
 
+  static KubernetesClient client;
+
   @RegisterExtension
   LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
+          .withKubernetesClient(client)
+          .waitForNamespaceDeletion(false)
           .withReconciler(new DependentOperationEventFilterCustomResourceTestReconciler())
           .build();
 

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

@@ -1,12 +1,19 @@
 package io.javaoperatorsdk.operator;
 
+import io.fabric8.kubernetes.client.KubernetesClient;
+import io.javaoperatorsdk.jenvtest.junit.EnableKubeAPIServer;
 import io.javaoperatorsdk.operator.junit.LocallyRunOperatorExtension;
 import io.javaoperatorsdk.operator.sample.primaryindexer.DependentPrimaryIndexerTestReconciler;
 
+@EnableKubeAPIServer
 public class DependentPrimaryIndexerIT extends PrimaryIndexerIT {
 
+  static KubernetesClient client;
+
   protected LocallyRunOperatorExtension buildOperator() {
     return LocallyRunOperatorExtension.builder()
+        .withKubernetesClient(client)
+        .waitForNamespaceDeletion(false)
         .withReconciler(new DependentPrimaryIndexerTestReconciler())
         .build();
   }