refactor: static usage of junit extension

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/CRDMappingInTestExtensionIT.java

@@ -25,7 +25,7 @@ public class CRDMappingInTestExtensionIT {
   private final KubernetesClient client = new KubernetesClientBuilder().build();
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new TestReconciler())
           .withAdditionalCRD("src/test/resources/crd/test.crd", "src/test/crd/test.crd")

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

@@ -26,7 +26,7 @@ class ConcurrencyIT {
   private static final Logger log = LoggerFactory.getLogger(ConcurrencyIT.class);
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(new TestReconciler(true)).build();
 
   @Test

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

@@ -20,7 +20,7 @@ class BuiltInResourceCleanerIT {
   private static final Logger log = LoggerFactory.getLogger(BuiltInResourceCleanerIT.class);
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new BuiltInResourceCleanerReconciler())
           .build();

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

@@ -29,7 +29,7 @@ class ChangeNamespaceIT {
   public static final String ADDITIONAL_TEST_NAMESPACE = "additional-test-namespace";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new ChangeNamespaceTestReconciler())
           .build();

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

@@ -14,7 +14,7 @@ class CleanerForReconcilerIT {
   public static final String TEST_RESOURCE_NAME = "cleaner-for-reconciler-test1";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new CleanerForReconcilerTestReconciler())
           .build();

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

@@ -18,7 +18,7 @@ class CleanupConflictIT {
   public static final String TEST_RESOURCE_NAME = "test1";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(new CleanupConflictReconciler()).build();
 
   @Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedResourceIT.java

@@ -20,7 +20,7 @@ class ClusterScopedResourceIT {
   public static final String UPDATED_DATA = "updatedData";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new ClusterScopedCustomResourceReconciler())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/concurrentfinalizerremoval/ConcurrentFinalizerRemovalIT.java

@@ -18,7 +18,7 @@ class ConcurrentFinalizerRemovalIT {
   public static final String TEST_RESOURCE_NAME = "test";
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
+  static LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           // should work without a retry, thus not retry the whole reconciliation but to retry
           // finalizer removal only.

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

@@ -16,7 +16,7 @@
 class CreateUpdateInformerEventSourceEventFilterIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new CreateUpdateEventFilterTestReconciler())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/PreviousAnnotationDisabledIT.java

@@ -8,7 +8,7 @@
 class PreviousAnnotationDisabledIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new CreateUpdateEventFilterTestReconciler())
           .withConfigurationService(

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/deployment/KubernetesResourceStatusUpdateIT.java

@@ -26,7 +26,7 @@
 class KubernetesResourceStatusUpdateIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(new DeploymentReconciler()).build();
 
   @Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationIT.java

@@ -18,7 +18,7 @@ class DynamicGenericEventSourceRegistrationIT {
   public static final String TEST_RESOURCE_NAME = "test1";
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
+  static LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(DynamicGenericEventSourceRegistrationReconciler.class)
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/errorstatushandler/ErrorStatusHandlerIT.java

@@ -15,10 +15,10 @@
 class ErrorStatusHandlerIT {
 
   public static final int MAX_RETRY_ATTEMPTS = 3;
-  ErrorStatusHandlerTestReconciler reconciler = new ErrorStatusHandlerTestReconciler();
+  static ErrorStatusHandlerTestReconciler reconciler = new ErrorStatusHandlerTestReconciler();
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(
               reconciler, new GenericRetry().setMaxAttempts(MAX_RETRY_ATTEMPTS).withLinearRetry())

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/event/EventSourceIT.java

@@ -15,7 +15,7 @@
 class EventSourceIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(EventSourceTestCustomReconciler.class)
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/filter/FilterIT.java

@@ -18,7 +18,7 @@ class FilterIT {
   public static final int POLL_DELAY = 150;
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(FilterTestReconciler.class).build();
 
   @Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingIT.java

@@ -11,7 +11,7 @@ public class GenericKubernetesResourceHandlingIT
     extends GenericKubernetesDependentTestBase<GenericKubernetesResourceHandlingCustomResource> {
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
+  static LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new GenericKubernetesResourceHandlingReconciler())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/gracefulstop/GracefulStopIT.java

@@ -17,7 +17,7 @@ public class GracefulStopIT {
   public static final String TEST_1 = "test1";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withConfigurationService(
               o ->

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceIT.java

@@ -24,7 +24,7 @@ class InformerEventSourceIT {
   public static final String UPDATE_STATUS_MESSAGE = "Updated Status";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new InformerEventSourceTestCustomReconciler())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterIT.java

@@ -30,7 +30,7 @@ class InformerRemoteClusterIT {
   static KubernetesClient kubernetesClient;
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
+  static LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new InformerRemoteClusterReconciler(kubernetesClient))
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/labelselector/LabelSelectorIT.java

@@ -18,7 +18,7 @@
 class LabelSelectorIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new LabelSelectorTestReconciler())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/leaderelectionchangenamespace/LeaderElectionChangeNamespaceIT.java

@@ -25,7 +25,7 @@ public class LeaderElectionChangeNamespaceIT {
   public static final String LEASE_NAME = "nschangelease";
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
+  static LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withConfigurationService(
               o -> o.withLeaderElectionConfiguration(new LeaderElectionConfiguration(LEASE_NAME)))

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/manualobservedgeneration/ManualObservedGenerationIT.java

@@ -14,7 +14,7 @@ public class ManualObservedGenerationIT {
   public static final String RESOURCE_NAME = "test1";
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
+  static LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new ManualObservedGenerationReconciler())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/maxinterval/MaxIntervalIT.java

@@ -14,7 +14,7 @@
 class MaxIntervalIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(new MaxIntervalTestReconciler()).build();
 
   @Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/maxintervalafterretry/MaxIntervalAfterRetryIT.java

@@ -14,7 +14,7 @@
 class MaxIntervalAfterRetryIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new MaxIntervalAfterRetryTestReconciler())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplereconcilersametype/MultipleReconcilerSameTypeIT.java

@@ -15,7 +15,7 @@ public class MultipleReconcilerSameTypeIT {
   public static final String TEST_RESOURCE_2 = "test2";
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
+  static LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(MultipleReconcilerSameTypeReconciler1.class)
           .withReconciler(MultipleReconcilerSameTypeReconciler2.class)

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceIT.java

@@ -16,7 +16,7 @@ class MultipleSecondaryEventSourceIT {
   public static final String TEST_RESOURCE_NAME = "testresource";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(MultipleSecondaryEventSourceReconciler.class)
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiversioncrd/MultiVersionCRDIT.java

@@ -28,8 +28,11 @@ class MultiVersionCRDIT {
   public static final String CR_V1_NAME = "crv1";
   public static final String CR_V2_NAME = "crv2";
 
+  private static final TestInformerStoppedHandler informerStoppedHandler =
+      new TestInformerStoppedHandler();
+
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(MultiVersionCRDTestReconciler1.class)
           .withReconciler(MultiVersionCRDTestReconciler2.class)
@@ -127,9 +130,6 @@ private String acceptOnlyIfUnsetOrEqualToAlreadySet(String existing, String newV
     }
   }
 
-  private static final TestInformerStoppedHandler informerStoppedHandler =
-      new TestInformerStoppedHandler();
-
   @Test
   void multipleCRDVersions() {
     informerStoppedHandler.reset();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/nextreconciliationimminent/NextReconciliationImminentIT.java

@@ -21,7 +21,7 @@ public class NextReconciliationImminentIT {
   public static final String TEST_RESOURCE_NAME = "test1";
 
   @RegisterExtension
-  LocallyRunOperatorExtension extension =
+  static LocallyRunOperatorExtension extension =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new NextReconciliationImminentReconciler())
           .build();

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAIT.java

@@ -14,7 +14,7 @@
 
 class PatchResourceAndStatusNoSSAIT {
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withConfigurationService(o -> o.withUseSSAToPatchPrimaryResource(false))
           .withReconciler(PatchResourceAndStatusNoSSAReconciler.class)

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/perresourceeventsource/PerResourcePollingEventSourceIT.java

@@ -15,7 +15,7 @@ class PerResourcePollingEventSourceIT {
   public static final String NAME_2 = "name2";
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withReconciler(new PerResourcePollingEventSourceTestReconciler())
           .build();

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

@@ -18,7 +18,7 @@ public class PrimaryIndexerIT {
   public static final String RESOURCE_NAME1 = "test1";
   public static final String RESOURCE_NAME2 = "test2";
 
-  @RegisterExtension LocallyRunOperatorExtension operator = buildOperator();
+  @RegisterExtension LocallyRunOperatorExtension extension = buildOperator();
 
   protected LocallyRunOperatorExtension buildOperator() {
     return LocallyRunOperatorExtension.builder()
@@ -28,9 +28,9 @@ protected LocallyRunOperatorExtension buildOperator() {
 
   @Test
   void changesToSecondaryResourcesCorrectlyTriggerReconciler() {
-    var reconciler = (AbstractPrimaryIndexerTestReconciler) operator.getFirstReconciler();
-    operator.create(createTestResource(RESOURCE_NAME1));
-    operator.create(createTestResource(RESOURCE_NAME2));
+    var reconciler = (AbstractPrimaryIndexerTestReconciler) extension.getFirstReconciler();
+    extension.create(createTestResource(RESOURCE_NAME1));
+    extension.create(createTestResource(RESOURCE_NAME2));
 
     await()
         .pollDelay(Duration.ofMillis(500))
@@ -40,7 +40,7 @@ void changesToSecondaryResourcesCorrectlyTriggerReconciler() {
               assertThat(reconciler.getNumberOfExecutions().get(RESOURCE_NAME2).get()).isEqualTo(1);
             });
 
-    operator.create(configMap());
+    extension.create(configMap());
 
     await()
         .pollDelay(Duration.ofMillis(500))

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/PrimaryToSecondaryIT.java

@@ -17,7 +17,7 @@ class PrimaryToSecondaryIT {
   public static final int MIN_DELAY = 150;
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withAdditionalCustomResourceDefinition(Cluster.class)
           .withReconciler(new JobReconciler())

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/PrimaryToSecondaryMissingIT.java

@@ -17,7 +17,7 @@
 class PrimaryToSecondaryMissingIT {
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder()
           .withAdditionalCustomResourceDefinition(Cluster.class)
           .withReconciler(new JobReconciler(false))

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ratelimit/RateLimitIT.java

@@ -20,7 +20,7 @@ class RateLimitIT {
   private static final Logger log = LoggerFactory.getLogger(RateLimitIT.class);
 
   @RegisterExtension
-  LocallyRunOperatorExtension operator =
+  static LocallyRunOperatorExtension operator =
       LocallyRunOperatorExtension.builder().withReconciler(new RateLimitReconciler()).build();
 
   @Test