diff --git a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java b/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java index 3e6ad35e52..c8d5baec82 100644 --- a/operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/LocallyRunOperatorExtension.java +++ b/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 reconcilers; private final List portForwards; private final List localPortForwards; private final List> additionalCustomResourceDefinitions; private final Map registeredControllers; private final Map crdMappings; + private final Consumer configurationServiceOverrider; private LocallyRunOperatorExtension( List 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) { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java index 9153ae4ff5..85b0aae666 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/CRDMappingInTestExtensionIT.java +++ b/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") diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ConcurrencyIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ConcurrencyIT.java index 80fb09095d..c141d9a70d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ConcurrencyIT.java +++ b/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 diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/builtinresourcecleaner/BuiltInResourceCleanerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/builtinresourcecleaner/BuiltInResourceCleanerIT.java index 9d914d080c..c0668561b0 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/builtinresourcecleaner/BuiltInResourceCleanerIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceIT.java index 67f65c64ca..7eedd78179 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/cleanerforreconciler/CleanerForReconcilerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/cleanerforreconciler/CleanerForReconcilerIT.java index 6ccb34f0e3..c281ae74c5 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/cleanerforreconciler/CleanerForReconcilerIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/cleanupconflict/CleanupConflictIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/cleanupconflict/CleanupConflictIT.java index 19ef6df9a0..a5114042eb 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/cleanupconflict/CleanupConflictIT.java +++ b/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 diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedResourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedResourceIT.java index 4c92fbada7..fa26410193 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedResourceIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/concurrentfinalizerremoval/ConcurrentFinalizerRemovalIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/concurrentfinalizerremoval/ConcurrentFinalizerRemovalIT.java index da166ce2c1..685d7b4d06 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/concurrentfinalizerremoval/ConcurrentFinalizerRemovalIT.java +++ b/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. diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateInformerEventSourceEventFilterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateInformerEventSourceEventFilterIT.java index 2d9a7db573..048bf3f2fd 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateInformerEventSourceEventFilterIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/PreviousAnnotationDisabledIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/PreviousAnnotationDisabledIT.java index b5554493ee..817b092369 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/PreviousAnnotationDisabledIT.java +++ b/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( diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/deployment/KubernetesResourceStatusUpdateIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/deployment/KubernetesResourceStatusUpdateIT.java index 5fe9bfa939..14066c60bf 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/deployment/KubernetesResourceStatusUpdateIT.java +++ b/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 diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationIT.java index 5c05850b4a..30aeed79f7 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/errorstatushandler/ErrorStatusHandlerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/errorstatushandler/ErrorStatusHandlerIT.java index b888143d2d..2e1e777f51 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/errorstatushandler/ErrorStatusHandlerIT.java +++ b/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()) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/event/EventSourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/event/EventSourceIT.java index eaa881709b..c1fc018d59 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/event/EventSourceIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/filter/FilterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/filter/FilterIT.java index 1e51ad5ab0..0be4e89290 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/filter/FilterIT.java +++ b/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 diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingIT.java index 3b2fccfe59..957d9541b1 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingIT.java @@ -11,7 +11,7 @@ public class GenericKubernetesResourceHandlingIT extends GenericKubernetesDependentTestBase { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new GenericKubernetesResourceHandlingReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/gracefulstop/GracefulStopIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/gracefulstop/GracefulStopIT.java index 4f499b256b..6c8df2a3cc 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/gracefulstop/GracefulStopIT.java +++ b/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 -> diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceIT.java index c1a857c22c..02b5416439 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterIT.java index 3cd5ddccbc..2ae5370f12 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/labelselector/LabelSelectorIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/labelselector/LabelSelectorIT.java index b073bee248..9efbc1a936 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/labelselector/LabelSelectorIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/leaderelectionchangenamespace/LeaderElectionChangeNamespaceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/leaderelectionchangenamespace/LeaderElectionChangeNamespaceIT.java index f6194439e2..3276d59465 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/leaderelectionchangenamespace/LeaderElectionChangeNamespaceIT.java +++ b/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))) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/manualobservedgeneration/ManualObservedGenerationIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/manualobservedgeneration/ManualObservedGenerationIT.java index f90fda5c5e..f7bb87d26d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/manualobservedgeneration/ManualObservedGenerationIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/maxinterval/MaxIntervalIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/maxinterval/MaxIntervalIT.java index af7cdbe8ec..dcfb466f9e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/maxinterval/MaxIntervalIT.java +++ b/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 diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/maxintervalafterretry/MaxIntervalAfterRetryIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/maxintervalafterretry/MaxIntervalAfterRetryIT.java index bc55fa6035..94da0cd1be 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/maxintervalafterretry/MaxIntervalAfterRetryIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplereconcilersametype/MultipleReconcilerSameTypeIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplereconcilersametype/MultipleReconcilerSameTypeIT.java index 81cfa7fd07..7e5a3f4448 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplereconcilersametype/MultipleReconcilerSameTypeIT.java +++ b/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) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceIT.java index 18a937040f..69418b2980 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiversioncrd/MultiVersionCRDIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiversioncrd/MultiVersionCRDIT.java index 9e0c6eb1fb..cb0da74536 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiversioncrd/MultiVersionCRDIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/nextreconciliationimminent/NextReconciliationImminentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/nextreconciliationimminent/NextReconciliationImminentIT.java index 03bd6b0a7a..6038364e0c 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/nextreconciliationimminent/NextReconciliationImminentIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAIT.java index cd63c708e9..0e3613a6af 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAIT.java +++ b/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) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/perresourceeventsource/PerResourcePollingEventSourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/perresourceeventsource/PerResourcePollingEventSourceIT.java index 20f89e0d39..fbca186b99 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/perresourceeventsource/PerResourcePollingEventSourceIT.java +++ b/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(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primaryindexer/PrimaryIndexerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primaryindexer/PrimaryIndexerIT.java index 9063ef0fcb..256fd7be31 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primaryindexer/PrimaryIndexerIT.java +++ b/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)) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/PrimaryToSecondaryIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/PrimaryToSecondaryIT.java index 9344cc787f..86dedf4b32 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/PrimaryToSecondaryIT.java +++ b/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()) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/PrimaryToSecondaryMissingIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/PrimaryToSecondaryMissingIT.java index 84e6910b35..e47f93235e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/PrimaryToSecondaryMissingIT.java +++ b/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)) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ratelimit/RateLimitIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ratelimit/RateLimitIT.java index 8b04fd0095..c5dcd7d36f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ratelimit/RateLimitIT.java +++ b/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 diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/retry/RetryIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/retry/RetryIT.java index 410d34a390..0be1f2fd61 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/retry/RetryIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/retry/RetryIT.java @@ -20,7 +20,7 @@ class RetryIT { public static final int NUMBER_FAILED_EXECUTIONS = 3; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler( new RetryTestCustomReconciler(NUMBER_FAILED_EXECUTIONS), diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/retry/RetryMaxAttemptIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/retry/RetryMaxAttemptIT.java index f57a70201f..e57af5b2ce 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/retry/RetryMaxAttemptIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/retry/RetryMaxAttemptIT.java @@ -15,10 +15,11 @@ class RetryMaxAttemptIT { public static final int RETRY_INTERVAL = 100; public static final int ALL_EXECUTION_TO_FAIL = 99; - RetryTestCustomReconciler reconciler = new RetryTestCustomReconciler(ALL_EXECUTION_TO_FAIL); + static RetryTestCustomReconciler reconciler = + new RetryTestCustomReconciler(ALL_EXECUTION_TO_FAIL); @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler( reconciler, diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java index cbd8de4459..c3b3dadaa2 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/ReconcilerExecutorIT.java @@ -16,7 +16,7 @@ class ReconcilerExecutorIT { @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder().withReconciler(new TestReconciler(true)).build(); @Test diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuscache/StatusPatchCacheIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuscache/StatusPatchCacheIT.java index 9d0b923056..087739749a 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuscache/StatusPatchCacheIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuscache/StatusPatchCacheIT.java @@ -16,7 +16,7 @@ public class StatusPatchCacheIT { public static final String TEST_1 = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(StatusPatchCacheReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuspatchnonlocking/StatusPatchNotLockingForNonSSAIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuspatchnonlocking/StatusPatchNotLockingForNonSSAIT.java index 4913b900a0..81671d1417 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuspatchnonlocking/StatusPatchNotLockingForNonSSAIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statuspatchnonlocking/StatusPatchNotLockingForNonSSAIT.java @@ -19,7 +19,7 @@ class StatusPatchNotLockingForNonSSAIT { public static final String TEST_RESOURCE_NAME = "test"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(StatusPatchLockingReconciler.class) .withConfigurationService(o -> o.withUseSSAToPatchPrimaryResource(false)) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statusupdatelocking/StatusUpdateLockingIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statusupdatelocking/StatusUpdateLockingIT.java index ad51d82059..e1655f5eb7 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statusupdatelocking/StatusUpdateLockingIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/statusupdatelocking/StatusUpdateLockingIT.java @@ -18,7 +18,7 @@ class StatusUpdateLockingIT { public static final String TEST_RESOURCE_NAME = "test"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withConfigurationService(o -> o.withUseSSAToPatchPrimaryResource(false)) .withReconciler(StatusUpdateLockingReconciler.class) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/subresource/SubResourceUpdateIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/subresource/SubResourceUpdateIT.java index 7544e3b791..21f866dc75 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/subresource/SubResourceUpdateIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/subresource/SubResourceUpdateIT.java @@ -20,9 +20,10 @@ class SubResourceUpdateIT { public static final int EVENT_RECEIVE_WAIT = 200; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(SubResourceTestCustomReconciler.class) + .withConfigurationService(o -> o.withCloseClientOnStop(false)) .build(); @Test diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/unmodifiabledependentpart/UnmodifiableDependentPartIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/unmodifiabledependentpart/UnmodifiableDependentPartIT.java index 735255c54c..532caff299 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/unmodifiabledependentpart/UnmodifiableDependentPartIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/unmodifiabledependentpart/UnmodifiableDependentPartIT.java @@ -19,7 +19,7 @@ public class UnmodifiableDependentPartIT { public static final String UPDATED_DATA = "updatedData"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(UnmodifiableDependentPartReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/updatestatusincleanupandreschedule/UpdateStatusInCleanupAndRescheduleIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/updatestatusincleanupandreschedule/UpdateStatusInCleanupAndRescheduleIT.java index b2a2b463ba..2ac298c6b0 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/updatestatusincleanupandreschedule/UpdateStatusInCleanupAndRescheduleIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/updatestatusincleanupandreschedule/UpdateStatusInCleanupAndRescheduleIT.java @@ -14,7 +14,7 @@ public class UpdateStatusInCleanupAndRescheduleIT { public static final String TEST_RESOURCE = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(UpdateStatusInCleanupAndRescheduleReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/BulkDependentDeleterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/BulkDependentDeleterIT.java index 108607283b..4568a2404f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/BulkDependentDeleterIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/BulkDependentDeleterIT.java @@ -8,7 +8,7 @@ public class BulkDependentDeleterIT extends BulkDependentTestBase { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new ManagedDeleterBulkReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/condition/BulkDependentWithConditionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/condition/BulkDependentWithConditionIT.java index eb3a6e7368..e062cc8162 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/condition/BulkDependentWithConditionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/condition/BulkDependentWithConditionIT.java @@ -16,7 +16,7 @@ class BulkDependentWithConditionIT { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new ManagedBulkDependentWithReadyConditionReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/BulkExternalDependentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/BulkExternalDependentIT.java index 4f7d425729..52f3ac3069 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/BulkExternalDependentIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/external/BulkExternalDependentIT.java @@ -12,7 +12,7 @@ class BulkExternalDependentIT { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new ExternalBulkResourceReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/managed/ManagedBulkDependentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/managed/ManagedBulkDependentIT.java index 61b7f62a24..5ac1d1897e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/managed/ManagedBulkDependentIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/managed/ManagedBulkDependentIT.java @@ -8,7 +8,7 @@ public class ManagedBulkDependentIT extends BulkDependentTestBase { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new ManagedBulkDependentReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/readonly/ReadOnlyBulkDependentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/readonly/ReadOnlyBulkDependentIT.java index 422360b7b2..ce803e64e5 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/readonly/ReadOnlyBulkDependentIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/readonly/ReadOnlyBulkDependentIT.java @@ -20,7 +20,7 @@ public class ReadOnlyBulkDependentIT { public static final String TEST = "test"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder().withReconciler(new ReadOnlyBulkReconciler()).build(); @Test diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/standalone/StandaloneBulkDependentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/standalone/StandaloneBulkDependentIT.java index a74102db0d..957be5c1cf 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/standalone/StandaloneBulkDependentIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/bulkdependent/standalone/StandaloneBulkDependentIT.java @@ -8,7 +8,7 @@ class StandaloneBulkDependentIT extends BulkDependentTestBase { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new StandaloneBulkDependentReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/cleanermanageddependent/CleanerForManagedDependentResourcesOnlyIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/cleanermanageddependent/CleanerForManagedDependentResourcesOnlyIT.java index b0b716e8e2..cf1752f391 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/cleanermanageddependent/CleanerForManagedDependentResourcesOnlyIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/cleanermanageddependent/CleanerForManagedDependentResourcesOnlyIT.java @@ -14,7 +14,7 @@ class CleanerForManagedDependentResourcesOnlyIT { public static final String TEST_RESOURCE_NAME = "cleaner-for-reconciler-test1"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new CleanerForManagedDependentTestReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAIT.java index 5c1923fa55..a7c123ac79 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAIT.java @@ -20,7 +20,7 @@ class CreateOnlyIfNotExistingDependentWithSSAIT { public static final String KEY = "key"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new CreateOnlyIfNotExistingDependentWithSSAReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperIT.java index 466837de4e..8cbbea1060 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperIT.java @@ -19,7 +19,7 @@ class DependentAnnotationSecondaryMapperIT { public static final String TEST_RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(DependentAnnotationSecondaryMapperReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentcustommappingannotation/DependentCustomMappingAnnotationIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentcustommappingannotation/DependentCustomMappingAnnotationIT.java index 42f365884f..0b9b67231b 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentcustommappingannotation/DependentCustomMappingAnnotationIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentcustommappingannotation/DependentCustomMappingAnnotationIT.java @@ -19,7 +19,7 @@ class DependentCustomMappingAnnotationIT { public static final String TEST_RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(DependentCustomMappingReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentdifferentnamespace/DependentDifferentNamespaceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentdifferentnamespace/DependentDifferentNamespaceIT.java index c02bac5a5d..9ff786e51a 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentdifferentnamespace/DependentDifferentNamespaceIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentdifferentnamespace/DependentDifferentNamespaceIT.java @@ -18,7 +18,7 @@ class DependentDifferentNamespaceIT { public static final String CHANGED_VALUE = "changed_value"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(DependentDifferentNamespaceReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentfilter/DependentFilterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentfilter/DependentFilterIT.java index bc7b578d7f..1693297aaf 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentfilter/DependentFilterIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentfilter/DependentFilterIT.java @@ -20,7 +20,7 @@ class DependentFilterIT { public static final String RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(DependentFilterTestReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentoperationeventfiltering/DependentOperationEventFilterIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentoperationeventfiltering/DependentOperationEventFilterIT.java index e9ddc6cd6e..a26f2ec9ab 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentoperationeventfiltering/DependentOperationEventFilterIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentoperationeventfiltering/DependentOperationEventFilterIT.java @@ -19,7 +19,7 @@ class DependentOperationEventFilterIT { public static final String SPEC_VAL_2 = "val2"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withNamespaceDeleteTimeout(2) .withReconciler(new DependentOperationEventFilterCustomResourceTestReconciler()) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentresourcecrossref/DependentResourceCrossRefIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentresourcecrossref/DependentResourceCrossRefIT.java index ae5cd25895..3b76cb482f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentresourcecrossref/DependentResourceCrossRefIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentresourcecrossref/DependentResourceCrossRefIT.java @@ -19,7 +19,7 @@ class DependentResourceCrossRefIT { public static final int EXECUTION_NUMBER = 50; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new DependentResourceCrossRefReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentssa/DependentSSAMatchingIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentssa/DependentSSAMatchingIT.java index 8ab686b1b8..afaa577a23 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentssa/DependentSSAMatchingIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentssa/DependentSSAMatchingIT.java @@ -28,7 +28,7 @@ public class DependentSSAMatchingIT { public static final String ADDITIONAL_VALUE = "Additional Value"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler( new DependentSSAReconciler(), o -> o.withFieldManager(CUSTOM_FIELD_MANAGER_NAME)) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateDependentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateDependentIT.java index 87e588673d..62985502d6 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateDependentIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateDependentIT.java @@ -7,7 +7,7 @@ public class ExternalStateDependentIT extends ExternalStateTestBase { @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(ExternalStateDependentReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateIT.java index bae36431b5..595ae4a738 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateIT.java @@ -22,7 +22,7 @@ class ExternalStateIT { private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder().withReconciler(ExternalStateReconciler.class).build(); @Test diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java index b2714fab47..3c8fa8e822 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkIT.java @@ -25,7 +25,7 @@ class ExternalStateBulkIT { private final ExternalIDGenServiceMock externalService = ExternalIDGenServiceMock.getInstance(); @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(ExternalStateBulkDependentReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/generickubernetesresource/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/generickubernetesresource/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedIT.java index 93fc34fbf0..fa94d9257d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/generickubernetesresource/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/generickubernetesresource/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedIT.java @@ -11,7 +11,7 @@ public class GenericKubernetesDependentManagedIT extends GenericKubernetesDependentTestBase { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new GenericKubernetesDependentManagedReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneIT.java index 9afdec5474..cbebb0d515 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/generickubernetesresource/generickubernetesdependentstandalone/GenericKubernetesDependentStandaloneIT.java @@ -11,7 +11,7 @@ public class GenericKubernetesDependentStandaloneIT extends GenericKubernetesDependentTestBase { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new GenericKubernetesDependentStandaloneReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/kubernetesdependentgarbagecollection/KubernetesDependentGarbageCollectionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/kubernetesdependentgarbagecollection/KubernetesDependentGarbageCollectionIT.java index 8e08c4e739..242dfd8dfd 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/kubernetesdependentgarbagecollection/KubernetesDependentGarbageCollectionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/kubernetesdependentgarbagecollection/KubernetesDependentGarbageCollectionIT.java @@ -18,7 +18,7 @@ class KubernetesDependentGarbageCollectionIT { public static final String TEST_RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new DependentGarbageCollectionTestReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresource/MultipleDependentResourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresource/MultipleDependentResourceIT.java index a7dfefdaa8..40749f8554 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresource/MultipleDependentResourceIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresource/MultipleDependentResourceIT.java @@ -22,7 +22,7 @@ public class MultipleDependentResourceIT { public static final String INITIAL_VALUE = "initial value"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new MultipleDependentResourceReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresourcewithsametype/MultipleDependentResourceWithNoDiscriminatorIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresourcewithsametype/MultipleDependentResourceWithNoDiscriminatorIT.java index 8be51ebf1a..675da7c0c9 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresourcewithsametype/MultipleDependentResourceWithNoDiscriminatorIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresourcewithsametype/MultipleDependentResourceWithNoDiscriminatorIT.java @@ -18,7 +18,7 @@ class MultipleDependentResourceWithNoDiscriminatorIT { public static final String TEST_RESOURCE_NAME = "multipledependentresource-testresource"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(MultipleDependentResourceWithDiscriminatorReconciler.class) .waitForNamespaceDeletion(true) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentsametypemultiinformer/MultipleDependentSameTypeMultiInformerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentsametypemultiinformer/MultipleDependentSameTypeMultiInformerIT.java index 5ba6d56be3..0f17400aae 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentsametypemultiinformer/MultipleDependentSameTypeMultiInformerIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentsametypemultiinformer/MultipleDependentSameTypeMultiInformerIT.java @@ -22,7 +22,7 @@ class MultipleDependentSameTypeMultiInformerIT { public static final int SECONDS = 30; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new MultipleManagedDependentResourceMultiInformerReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledrsametypenodiscriminator/MultipleManagedDependentNoDiscriminatorIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledrsametypenodiscriminator/MultipleManagedDependentNoDiscriminatorIT.java index 1ed1da56f9..a876074242 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledrsametypenodiscriminator/MultipleManagedDependentNoDiscriminatorIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledrsametypenodiscriminator/MultipleManagedDependentNoDiscriminatorIT.java @@ -20,7 +20,7 @@ public class MultipleManagedDependentNoDiscriminatorIT { public static final String CHANGED_VALUE = "changed_value"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new MultipleManagedDependentSameTypeNoDiscriminatorReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanageddependentsametype/MultipleManagedDependentSameTypeIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanageddependentsametype/MultipleManagedDependentSameTypeIT.java index a835b5a255..38160eee2d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanageddependentsametype/MultipleManagedDependentSameTypeIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanageddependentsametype/MultipleManagedDependentSameTypeIT.java @@ -22,7 +22,7 @@ class MultipleManagedDependentSameTypeIT { public static final int SECONDS = 30; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new MultipleManagedDependentResourceReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentSameTypeIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentSameTypeIT.java index a8c1f889d0..9474acced3 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentSameTypeIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentSameTypeIT.java @@ -14,7 +14,7 @@ class MultipleManagedExternalDependentSameTypeIT { @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new MultipleManagedExternalDependentResourceReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipleupdateondependent/MultiOwnerDependentTriggeringIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipleupdateondependent/MultiOwnerDependentTriggeringIT.java index d5a704ca0c..3b75b76356 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipleupdateondependent/MultiOwnerDependentTriggeringIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipleupdateondependent/MultiOwnerDependentTriggeringIT.java @@ -20,7 +20,7 @@ class MultiOwnerDependentTriggeringIT { public static final String NEW_VALUE_2 = "newValue2"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withConfigurationService(o -> o.withDefaultNonSSAResource(Set.of())) .withReconciler(MultipleOwnerDependentReconciler.class) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/prevblocklist/PrevAnnotationBlockReconcilerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/prevblocklist/PrevAnnotationBlockReconcilerIT.java index 137e2ba663..5b19a80c9c 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/prevblocklist/PrevAnnotationBlockReconcilerIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/prevblocklist/PrevAnnotationBlockReconcilerIT.java @@ -17,7 +17,7 @@ class PrevAnnotationBlockReconcilerIT { public static final String TEST_1 = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() // Removing resource from blocklist List would result in test failure // .withConfigurationService( diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primarytosecondaydependent/PrimaryToSecondaryDependentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primarytosecondaydependent/PrimaryToSecondaryDependentIT.java index 11a080a8bf..ae97118d75 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primarytosecondaydependent/PrimaryToSecondaryDependentIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primarytosecondaydependent/PrimaryToSecondaryDependentIT.java @@ -21,7 +21,9 @@ class PrimaryToSecondaryDependentIT { public static final String TEST_CR_NAME = "test1"; public static final String TEST_DATA = "testData"; - public @RegisterExtension LocallyRunOperatorExtension operator = + + @RegisterExtension + public static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new PrimaryToSecondaryDependentReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/servicestrictmatcher/ServiceStrictMatcherIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/servicestrictmatcher/ServiceStrictMatcherIT.java index 72edd4ae40..8c7548fe26 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/servicestrictmatcher/ServiceStrictMatcherIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/servicestrictmatcher/ServiceStrictMatcherIT.java @@ -14,7 +14,7 @@ public class ServiceStrictMatcherIT { @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new ServiceStrictMatcherTestReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/specialresourcesdependent/SpecialResourcesDependentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/specialresourcesdependent/SpecialResourcesDependentIT.java index 3d62512bd7..e4e5bf23e3 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/specialresourcesdependent/SpecialResourcesDependentIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/specialresourcesdependent/SpecialResourcesDependentIT.java @@ -21,7 +21,7 @@ public class SpecialResourcesDependentIT { public static final String RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new SpecialResourceTestReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/ssalegacymatcher/SSAWithLegacyMatcherIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/ssalegacymatcher/SSAWithLegacyMatcherIT.java index 63afd73d1a..78dd84878f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/ssalegacymatcher/SSAWithLegacyMatcherIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/ssalegacymatcher/SSAWithLegacyMatcherIT.java @@ -15,7 +15,7 @@ public class SSAWithLegacyMatcherIT { public static final String TEST_RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new SSALegacyMatcherReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java index 91fbd64a19..5a8ca8914d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/standalonedependent/StandaloneDependentResourceIT.java @@ -21,7 +21,7 @@ public class StandaloneDependentResourceIT { public static final String DEPENDENT_TEST_NAME = "dependent-test1"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new StandaloneDependentTestReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/statefulsetdesiredsanitizer/StatefulSetDesiredSanitizerIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/statefulsetdesiredsanitizer/StatefulSetDesiredSanitizerIT.java index f54708a9ea..f751bd8970 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/statefulsetdesiredsanitizer/StatefulSetDesiredSanitizerIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/statefulsetdesiredsanitizer/StatefulSetDesiredSanitizerIT.java @@ -17,7 +17,7 @@ public class StatefulSetDesiredSanitizerIT { public static final String TEST_1 = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new StatefulSetDesiredSanitizerReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java index 4af8467c5c..b3da3be188 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowIT.java @@ -23,7 +23,7 @@ class ComplexWorkflowIT { public static final String TEST_RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder().withReconciler(new ComplexWorkflowReconciler()).build(); @Test diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/crdpresentactivation/CRDPresentActivationConditionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/crdpresentactivation/CRDPresentActivationConditionIT.java index 1793cceefa..ccf931f95d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/crdpresentactivation/CRDPresentActivationConditionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/crdpresentactivation/CRDPresentActivationConditionIT.java @@ -20,7 +20,7 @@ public class CRDPresentActivationConditionIT { "crdpresentactivationdependentcustomresources.sample.javaoperatorsdk"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new CRDPresentActivationReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/getnonactivesecondary/WorkflowActivationConditionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/getnonactivesecondary/WorkflowActivationConditionIT.java index 0de986ccf9..b3b13197a2 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/getnonactivesecondary/WorkflowActivationConditionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/getnonactivesecondary/WorkflowActivationConditionIT.java @@ -14,7 +14,7 @@ public class WorkflowActivationConditionIT { public static final String TEST_RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(WorkflowActivationConditionReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/manageddependentdeletecondition/ManagedDependentDeleteConditionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/manageddependentdeletecondition/ManagedDependentDeleteConditionIT.java index 482d2e5091..7d799fc8fb 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/manageddependentdeletecondition/ManagedDependentDeleteConditionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/manageddependentdeletecondition/ManagedDependentDeleteConditionIT.java @@ -20,7 +20,7 @@ public class ManagedDependentDeleteConditionIT { public static final String CUSTOM_FINALIZER = "test/customfinalizer"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withConfigurationService(o -> o.withDefaultNonSSAResource(Set.of())) .withReconciler(new ManagedDependentDefaultDeleteConditionReconciler()) diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/multipledependentwithactivation/MultipleDependentWithActivationIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/multipledependentwithactivation/MultipleDependentWithActivationIT.java index 2360660adc..b9bc36e203 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/multipledependentwithactivation/MultipleDependentWithActivationIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/multipledependentwithactivation/MultipleDependentWithActivationIT.java @@ -18,7 +18,7 @@ public class MultipleDependentWithActivationIT { public static final String TEST_RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(new MultipleDependentActivationReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/orderedmanageddependent/OrderedManagedDependentIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/orderedmanageddependent/OrderedManagedDependentIT.java index ff25911a8c..d7e4fa0b8e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/orderedmanageddependent/OrderedManagedDependentIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/orderedmanageddependent/OrderedManagedDependentIT.java @@ -14,7 +14,7 @@ class OrderedManagedDependentIT { @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(new OrderedManagedDependentTestReconciler()) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowactivationcondition/WorkflowActivationConditionIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowactivationcondition/WorkflowActivationConditionIT.java index a5b5b23fe3..d6b05eda95 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowactivationcondition/WorkflowActivationConditionIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowactivationcondition/WorkflowActivationConditionIT.java @@ -17,7 +17,7 @@ public class WorkflowActivationConditionIT { public static final String TEST_DATA = "test data"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(WorkflowActivationConditionReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java index 93551dcf43..6628a44b74 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowallfeature/WorkflowAllFeatureIT.java @@ -21,7 +21,7 @@ public class WorkflowAllFeatureIT { private static final Duration ONE_MINUTE = Duration.ofMinutes(1); @RegisterExtension - LocallyRunOperatorExtension operator = + static LocallyRunOperatorExtension operator = LocallyRunOperatorExtension.builder() .withReconciler(WorkflowAllFeatureReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowexplicitcleanup/WorkflowExplicitCleanupIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowexplicitcleanup/WorkflowExplicitCleanupIT.java index b6d4969fd3..e3976bafa3 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowexplicitcleanup/WorkflowExplicitCleanupIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowexplicitcleanup/WorkflowExplicitCleanupIT.java @@ -15,7 +15,7 @@ public class WorkflowExplicitCleanupIT { public static final String RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(WorkflowExplicitCleanupReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowexplicitinvocation/WorkflowExplicitInvocationIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowexplicitinvocation/WorkflowExplicitInvocationIT.java index eaa799300f..d49d04af41 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowexplicitinvocation/WorkflowExplicitInvocationIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowexplicitinvocation/WorkflowExplicitInvocationIT.java @@ -17,7 +17,7 @@ public class WorkflowExplicitInvocationIT { public static final String RESOURCE_NAME = "test1"; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(WorkflowExplicitInvocationReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowmultipleactivation/WorkflowMultipleActivationIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowmultipleactivation/WorkflowMultipleActivationIT.java index 0d5f3b60f1..343e86520b 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowmultipleactivation/WorkflowMultipleActivationIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowmultipleactivation/WorkflowMultipleActivationIT.java @@ -23,7 +23,7 @@ public class WorkflowMultipleActivationIT { public static final int POLL_DELAY = 300; @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(WorkflowMultipleActivationReconciler.class) .build(); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowsilentexceptionhandling/WorkflowSilentExceptionHandlingIT.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowsilentexceptionhandling/WorkflowSilentExceptionHandlingIT.java index 2f5b7246c6..92120de57b 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowsilentexceptionhandling/WorkflowSilentExceptionHandlingIT.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/workflowsilentexceptionhandling/WorkflowSilentExceptionHandlingIT.java @@ -12,7 +12,7 @@ public class WorkflowSilentExceptionHandlingIT { @RegisterExtension - LocallyRunOperatorExtension extension = + static LocallyRunOperatorExtension extension = LocallyRunOperatorExtension.builder() .withReconciler(HandleWorkflowExceptionsInReconcilerReconciler.class) .build();