From 2dcdd770db80c7c5373921c08b09f6eef4f41fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Fri, 7 Aug 2026 10:53:03 +0200 Subject: [PATCH 1/2] improve: followup PR for Informer Pools MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - addresses deprecations - addresses late PR comments for Informer Pools: https://github.com/operator-framework/java-operator-sdk/pull/3325 Signed-off-by: Attila Mészáros --- .../cache/sample/AbstractTestReconciler.java | 5 ++--- .../en/docs/documentation/event-filters.md | 2 +- .../content/en/docs/documentation/eventing.md | 2 +- .../documentation/operations/configuration.md | 2 +- .../documentation/working-with-es-caches.md | 7 +++---- .../config/ConfigurationServiceOverrider.java | 7 +++---- .../InformerEventSourceConfiguration.java | 5 ++++- .../KubernetesDependentResource.java | 2 +- .../source/informer/InformerEventSource.java | 3 +-- .../ChangeNamespaceTestReconciler.java | 3 +-- ...ClusterScopedCustomResourceReconciler.java | 5 ++--- ...CreateUpdateEventFilterTestReconciler.java | 4 +++- ...ericEventSourceRegistrationReconciler.java | 13 ++++-------- .../onallevent/ExpectationReconciler.java | 3 +-- .../PeriodicCleanerExpectationReconciler.java | 3 +-- .../FieldSelectorTestReconciler.java | 3 +-- .../baseapi/filter/FilterTestReconciler.java | 2 +- ...cKubernetesResourceHandlingReconciler.java | 6 +++--- ...formerEventSourceTestCustomReconciler.java | 2 +- .../basic/SharedInformerReconciler1.java | 2 +- .../basic/SharedInformerReconciler2.java | 2 +- .../deregister/DeregisterReconciler.java | 7 +++---- .../DynamicSharedInformerReconciler.java | 9 +++------ .../StaticSharedInformerReconciler.java | 2 +- .../InformerRemoteClusterReconciler.java | 5 ++--- .../LatestDistinctTestReconciler.java | 4 +--- ...ultipleSecondaryEventSourceReconciler.java | 2 +- .../OwnerRefMultiVersionReconciler.java | 5 ++--- .../PrimaryIndexerTestReconciler.java | 2 +- .../primarytosecondary/JobReconciler.java | 2 +- .../ExternalSecondaryUpdateReconciler.java | 3 +-- .../OnRelistFilterReconciler.java | 8 +++----- .../OwnSecondaryUpdateReconciler.java | 3 +-- .../ReadOwnUpdatesReconciler.java | 3 +-- ...SecondaryResourceOperationsReconciler.java | 3 +-- .../TargetReconciler.java | 2 +- .../baseapi/simple/TestReconciler.java | 3 +-- .../StartupSecondaryAccessReconciler.java | 3 +-- .../ExternalStateDependentReconciler.java | 5 ++--- .../ExternalStateReconciler.java | 3 +-- .../ExternalStateBulkDependentReconciler.java | 5 ++--- .../MultipleDependentResourceReconciler.java | 3 +-- ...ntResourceWithDiscriminatorReconciler.java | 3 +-- ...dentSameTypeNoDiscriminatorReconciler.java | 3 +-- ...pleManagedDependentResourceReconciler.java | 3 +-- ...DependentPrimaryIndexerTestReconciler.java | 3 +-- ...PrimaryToSecondaryDependentReconciler.java | 5 ++--- .../ComplexWorkflowReconciler.java | 6 ++---- .../operator/sample/WebappReconciler.java | 2 +- .../operator/sample/WebPageReconciler.java | 20 ++++++++----------- 50 files changed, 85 insertions(+), 125 deletions(-) diff --git a/caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java b/caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java index 292ddb975b..89bf3ba05a 100644 --- a/caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java +++ b/caffeine-bounded-cache-support/src/test/java/io/javaoperatorsdk/operator/processing/event/source/cache/sample/AbstractTestReconciler.java @@ -96,15 +96,14 @@ public List> prepareEventSources(EventSourceContext

context 1); // setting max size for testing purposes var es = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from(ConfigMap.class, primaryClass()) .withItemStore(boundedItemStore) .withSecondaryToPrimaryMapper( Mappers.fromOwnerReferences( context.getPrimaryResourceClass(), this instanceof BoundedCacheClusterScopeTestReconciler)) - .build(), - context); + .build()); return List.of(es); } diff --git a/docs/content/en/docs/documentation/event-filters.md b/docs/content/en/docs/documentation/event-filters.md index 661f3931f3..4965c505c7 100644 --- a/docs/content/en/docs/documentation/event-filters.md +++ b/docs/content/en/docs/documentation/event-filters.md @@ -84,7 +84,7 @@ public List> prepareEventSources( .withOnAddFilter(cm -> true) .build(); - return List.of(new InformerEventSource<>(informerConfiguration, context)); + return List.of(new InformerEventSource<>(informerConfiguration)); } ``` diff --git a/docs/content/en/docs/documentation/eventing.md b/docs/content/en/docs/documentation/eventing.md index 340946d393..e7aea6b065 100644 --- a/docs/content/en/docs/documentation/eventing.md +++ b/docs/content/en/docs/documentation/eventing.md @@ -97,7 +97,7 @@ public class WebPageReconciler implements Reconciler { InformerEventSourceConfiguration.from(Deployment.class, WebPage.class) .withLabelSelector(SELECTOR) .build(); - return List.of(new InformerEventSource<>(configuration, context)); + return List.of(new InformerEventSource<>(configuration)); } // omitted code diff --git a/docs/content/en/docs/documentation/operations/configuration.md b/docs/content/en/docs/documentation/operations/configuration.md index 513cc432d8..77bf17b175 100644 --- a/docs/content/en/docs/documentation/operations/configuration.md +++ b/docs/content/en/docs/documentation/operations/configuration.md @@ -84,7 +84,7 @@ public class MyReconciler implements Reconciler { InformerEventSource configMapES = new InformerEventSource<>(InformerEventSourceConfiguration.from(ConfigMap.class, TestCustomResource.class) .withNamespacesInheritedFromController(context) - .build(), context); + .build()); return EventSourceUtils.nameEventSources(configMapES); } diff --git a/docs/content/en/docs/documentation/working-with-es-caches.md b/docs/content/en/docs/documentation/working-with-es-caches.md index 07c8a02f1b..d31f1e079f 100644 --- a/docs/content/en/docs/documentation/working-with-es-caches.md +++ b/docs/content/en/docs/documentation/working-with-es-caches.md @@ -85,8 +85,7 @@ public class WebPageReconciler implements Reconciler { configMapEventSource = new InformerEventSource<>( InformerEventSourceConfiguration.from(ConfigMap.class, WebPage.class) .withLabelSelector(SELECTOR) - .build(), - context); + .build()); return List.of(configMapEventSource); } @@ -200,7 +199,7 @@ With this index in place, you can retrieve the target resources very efficiently ```java InformerEventSource clusterInformer = - new InformerEventSource( + new InformerEventSource<>( InformerEventSourceConfiguration.from(Cluster.class, Job.class) .withSecondaryToPrimaryMapper( cluster -> @@ -214,7 +213,7 @@ With this index in place, you can retrieve the target resources very efficiently .stream() .map(ResourceID::fromResource) .collect(Collectors.toSet())) - .withNamespacesInheritedFromController().build(), context); + .withNamespacesInheritedFromController().build()); ``` ## Read-cache-after-write consistency and event filtering diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java index e07cd336f1..9b199341ac 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java @@ -30,7 +30,6 @@ import io.javaoperatorsdk.operator.api.monitoring.Metrics; import io.javaoperatorsdk.operator.api.reconciler.Experimental; import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResourceFactory; -import io.javaoperatorsdk.operator.processing.event.source.informer.pool.AbstractInformerPool; import io.javaoperatorsdk.operator.processing.event.source.informer.pool.InformerPool; @SuppressWarnings({"unused", "UnusedReturnValue"}) @@ -184,13 +183,13 @@ public ConfigurationServiceOverrider withCloneSecondaryResourcesWhenGettingFromC * Overrides the informer pool strategy used to create/share the informers backing the event * sources. When not set, the default (informer-sharing) pool is used. * - *

Custom strategies extend {@link AbstractInformerPool}, which already takes care of creating - * and starting the informers. + *

Custom strategies extend {@link InformerPool}, which already takes care of creating and + * starting the informers. */ @Experimental( "Only the configuration API around informer pooling could still change in a" + " non-backwards-compatible way, the pooling itself is prod ready.") - public ConfigurationServiceOverrider withInformerPool(AbstractInformerPool informerPool) { + public ConfigurationServiceOverrider withInformerPool(InformerPool informerPool) { this.informerPool = informerPool; return this; } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java index b6f7939728..6c08d9f0e2 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerEventSourceConfiguration.java @@ -76,7 +76,10 @@ default boolean followControllerNamespaceChanges() {

PrimaryToSecondaryMapper

getPrimaryToSecondaryMapper(); - // todo deprecate + /** + * @deprecated use {@link InformerConfiguration#getResourceGroupVersionKind()} + */ + @Deprecated(forRemoval = true) Optional getGroupVersionKind(); default String name() { diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java index bb59d6eed6..d87c853251 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java @@ -220,7 +220,7 @@ protected InformerEventSource createEventSource(EventSourceContext

cont configBuilder.updateFrom(kubernetesDependentResourceConfig.informerConfig()); } - var es = new InformerEventSource<>(configBuilder.build(), context); + var es = new InformerEventSource(configBuilder.build()); setEventSource(es); return eventSource().orElseThrow(); } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java index cb0fdaa8dd..dc6fefaeb7 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java @@ -53,9 +53,8 @@ public class InformerEventSource private final PrimaryToSecondaryMapper

primaryToSecondaryMapper; /** - * @deprecated use {@link InformerEventSource(InformerEventSourceConfiguration)} + * @deprecated use {@link #InformerEventSource(InformerEventSourceConfiguration)} */ - // todo migrate sample, separate PR? @Deprecated(forRemoval = true) public InformerEventSource( InformerEventSourceConfiguration configuration, EventSourceContext

context) { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceTestReconciler.java index c8bee56793..103284c7cd 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/changenamespace/ChangeNamespaceTestReconciler.java @@ -42,8 +42,7 @@ public List> prepareEventSourc new InformerEventSource<>( InformerEventSourceConfiguration.from( ConfigMap.class, ChangeNamespaceTestCustomResource.class) - .build(), - context); + .build()); return List.of(configMapES); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedCustomResourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedCustomResourceReconciler.java index ff1c1e4207..953d36f150 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedCustomResourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/clusterscopedresource/ClusterScopedCustomResourceReconciler.java @@ -79,14 +79,13 @@ private ConfigMap desired(ClusterScopedCustomResource resource) { public List> prepareEventSources( EventSourceContext context) { var ies = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from( ConfigMap.class, ClusterScopedCustomResource.class) .withSecondaryToPrimaryMapper( Mappers.fromOwnerReferences(context.getPrimaryResourceClass(), true)) .withLabelSelector(TEST_LABEL_KEY + "=" + TEST_LABEL_VALUE) - .build(), - context); + .build()); return List.of(ies); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java index 4344356ff9..23056be0fe 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java @@ -102,7 +102,9 @@ public List> prepareEv .withComparableResourceVersion(comparableResourceVersion) .build(); - final var informerEventSource = new InformerEventSource<>(informerConfiguration, context); + final var informerEventSource = + new InformerEventSource( + informerConfiguration); this.configMapDR.setEventSource(informerEventSource); return List.of(informerEventSource); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationReconciler.java index e9e5105587..88267b47ba 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/dynamicgenericeventsourceregistration/DynamicGenericEventSourceRegistrationReconciler.java @@ -45,10 +45,8 @@ public UpdateControl reconc context .eventSourceRetriever() - .dynamicallyRegisterEventSource(genericInformerFor(ConfigMap.class, context)); - context - .eventSourceRetriever() - .dynamicallyRegisterEventSource(genericInformerFor(Secret.class, context)); + .dynamicallyRegisterEventSource(genericInformerFor(ConfigMap.class)); + context.eventSourceRetriever().dynamicallyRegisterEventSource(genericInformerFor(Secret.class)); context.getClient().resource(secret(primary)).createOr(NonDeletingOperation::update); context.getClient().resource(configMap(primary)).createOr(NonDeletingOperation::update); @@ -89,17 +87,14 @@ private ConfigMap configMap(DynamicGenericEventSourceRegistrationCustomResource private InformerEventSource< GenericKubernetesResource, DynamicGenericEventSourceRegistrationCustomResource> - genericInformerFor( - Class clazz, - Context context) { + genericInformerFor(Class clazz) { return new InformerEventSource<>( InformerEventSourceConfiguration.from( GroupVersionKind.gvkFor(clazz), DynamicGenericEventSourceRegistrationCustomResource.class) .withName(clazz.getSimpleName()) - .build(), - context.eventSourceRetriever().eventSourceContextForDynamicRegistration()); + .build()); } public int getNumberOfExecutions() { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationReconciler.java index 5c0b4dcebe..460cbbee98 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/onallevent/ExpectationReconciler.java @@ -103,8 +103,7 @@ public List> prepareEventSources( return List.of( new InformerEventSource<>( InformerEventSourceConfiguration.from(Deployment.class, ExpectationCustomResource.class) - .build(), - context)); + .build())); } private static void createDeployment( diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationReconciler.java index 7fc6f5bf82..f903df479d 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/expectation/periodicclean/PeriodicCleanerExpectationReconciler.java @@ -128,8 +128,7 @@ public List> prepareEve new InformerEventSource<>( InformerEventSourceConfiguration.from( Deployment.class, PeriodicCleanerExpectationCustomResource.class) - .build(), - context)); + .build())); } private static void createDeployment( diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/fieldselector/FieldSelectorTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/fieldselector/FieldSelectorTestReconciler.java index 49a4e39b38..50e16103a8 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/fieldselector/FieldSelectorTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/fieldselector/FieldSelectorTestReconciler.java @@ -72,8 +72,7 @@ public List> prepareEventSources(EventSourceContext> prepareEventSources( !newCM.getData().get(CM_VALUE_KEY).equals(CONFIG_MAP_FILTER_VALUE)) .build(); InformerEventSource configMapES = - new InformerEventSource<>(informerConfiguration, context); + new InformerEventSource<>(informerConfiguration); return List.of(configMapES); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java index 7efa8a0ad6..bebca87195 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/generickubernetesresourcehandling/GenericKubernetesResourceHandlingReconciler.java @@ -66,12 +66,12 @@ public List> pre EventSourceContext context) { var informerEventSource = - new InformerEventSource<>( + new InformerEventSource< + GenericKubernetesResource, GenericKubernetesResourceHandlingCustomResource>( InformerEventSourceConfiguration.from( new GroupVersionKind("", VERSION, KIND), GenericKubernetesResourceHandlingCustomResource.class) - .build(), - context); + .build()); return List.of(informerEventSource); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceTestCustomReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceTestCustomReconciler.java index 2ca81d99d5..0b9e19c4fd 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceTestCustomReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informereventsource/InformerEventSourceTestCustomReconciler.java @@ -61,7 +61,7 @@ public List> prepareEventS InformerEventSourceTestCustomResource.class)) .build(); - return List.of(new InformerEventSource<>(config, context)); + return List.of(new InformerEventSource<>(config)); } @Override diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler1.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler1.java index d526ff7713..dc652762c5 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler1.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler1.java @@ -45,7 +45,7 @@ public List> prepareEventSources( var config = InformerEventSourceConfiguration.from(ConfigMap.class, SharedInformerCustomResource1.class) .build(); - return List.of(new InformerEventSource<>(config, context)); + return List.of(new InformerEventSource<>(config)); } @Override diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler2.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler2.java index 84f9718d52..19535adcb5 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler2.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/basic/SharedInformerReconciler2.java @@ -44,7 +44,7 @@ public List> prepareEventSources( var config = InformerEventSourceConfiguration.from(ConfigMap.class, SharedInformerCustomResource2.class) .build(); - return List.of(new InformerEventSource<>(config, context)); + return List.of(new InformerEventSource<>(config)); } @Override diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/deregister/DeregisterReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/deregister/DeregisterReconciler.java index 680ce87077..3400bb30c2 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/deregister/DeregisterReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/deregister/DeregisterReconciler.java @@ -45,7 +45,7 @@ public UpdateControl reconcile( numberOfExecutions.incrementAndGet(); if (primary.getSpec() != null && primary.getSpec().isRegisterEventSource()) { - context.eventSourceRetriever().dynamicallyRegisterEventSource(watchedEventSource(context)); + context.eventSourceRetriever().dynamicallyRegisterEventSource(watchedEventSource()); } else { context.eventSourceRetriever().dynamicallyDeRegisterEventSource(WATCHED_EVENT_SOURCE_NAME); } @@ -54,7 +54,7 @@ public UpdateControl reconcile( } private InformerEventSource - watchedEventSource(Context context) { + watchedEventSource() { var config = InformerEventSourceConfiguration.from( DeregisterWatchedCustomResource.class, DeregisterPrimaryCustomResource.class) @@ -63,8 +63,7 @@ public UpdateControl reconcile( (DeregisterWatchedCustomResource watched) -> Set.of(new ResourceID("ignored", watched.getMetadata().getNamespace()))) .build(); - return new InformerEventSource<>( - config, context.eventSourceRetriever().eventSourceContextForDynamicRegistration()); + return new InformerEventSource<>(config); } public int getNumberOfExecutions() { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/DynamicSharedInformerReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/DynamicSharedInformerReconciler.java index 1779a1b43e..7b66c79540 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/DynamicSharedInformerReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/DynamicSharedInformerReconciler.java @@ -53,15 +53,13 @@ public UpdateControl reconcile( DynamicSharedInformerPrimaryCustomResource2 resource, Context context) { numberOfExecutions.incrementAndGet(); - context - .eventSourceRetriever() - .dynamicallyRegisterEventSource(thirdResourceEventSource(context)); + context.eventSourceRetriever().dynamicallyRegisterEventSource(thirdResourceEventSource()); return UpdateControl.noUpdate(); } private InformerEventSource< DynamicSharedInformerThirdCustomResource, DynamicSharedInformerPrimaryCustomResource2> - thirdResourceEventSource(Context context) { + thirdResourceEventSource() { var config = InformerEventSourceConfiguration.from( DynamicSharedInformerThirdCustomResource.class, @@ -71,8 +69,7 @@ public UpdateControl reconcile( (DynamicSharedInformerThirdCustomResource third) -> Set.of(new ResourceID(PRIMARY_NAME, third.getMetadata().getNamespace()))) .build(); - return new InformerEventSource<>( - config, context.eventSourceRetriever().eventSourceContextForDynamicRegistration()); + return new InformerEventSource<>(config); } public int getNumberOfExecutions() { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/StaticSharedInformerReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/StaticSharedInformerReconciler.java index be7bce6ce6..75db3ab3e8 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/StaticSharedInformerReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerpool/dynamic/StaticSharedInformerReconciler.java @@ -56,7 +56,7 @@ public List> prepare (DynamicSharedInformerThirdCustomResource third) -> Set.of(new ResourceID(PRIMARY_NAME, third.getMetadata().getNamespace()))) .build(); - return List.of(new InformerEventSource<>(config, context)); + return List.of(new InformerEventSource<>(config)); } @Override diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterReconciler.java index 9dba692721..e5dfed4534 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/informerremotecluster/InformerRemoteClusterReconciler.java @@ -70,7 +70,7 @@ public List> prepareEventSou EventSourceContext context) { var es = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from( ConfigMap.class, InformerRemoteClusterCustomResource.class) // owner references do not work cross cluster, using @@ -80,8 +80,7 @@ public List> prepareEventSou // setting remote client for informer .withKubernetesClient(remoteClient) .withWatchAllNamespaces() - .build(), - context); + .build()); return List.of(es); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/latestdistinct/LatestDistinctTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/latestdistinct/LatestDistinctTestReconciler.java index 92eb5aa8fa..c7b7f18b90 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/latestdistinct/LatestDistinctTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/latestdistinct/LatestDistinctTestReconciler.java @@ -126,9 +126,7 @@ public List> prepareEventSources( cm.getMetadata().getNamespace()))) .build(); - return List.of( - new InformerEventSource<>(configEs1, context), - new InformerEventSource<>(configEs2, context)); + return List.of(new InformerEventSource<>(configEs1), new InformerEventSource<>(configEs2)); } @Override diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java index 2a11be1faf..fb151fd347 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/multiplesecondaryeventsource/MultipleSecondaryEventSourceReconciler.java @@ -87,7 +87,7 @@ public List> prepareE }) .build(); InformerEventSource - configMapEventSource = new InformerEventSource<>(config, context); + configMapEventSource = new InformerEventSource<>(config); return List.of(configMapEventSource); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ownerreferencemultiversion/OwnerRefMultiVersionReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ownerreferencemultiversion/OwnerRefMultiVersionReconciler.java index c9680b0c81..b0a4220d00 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ownerreferencemultiversion/OwnerRefMultiVersionReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/ownerreferencemultiversion/OwnerRefMultiVersionReconciler.java @@ -77,13 +77,12 @@ public UpdateControl reconcile( public List> prepareEventSources( EventSourceContext context) { var ies = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from(ConfigMap.class, OwnerRefMultiVersionCR1.class) .withSecondaryToPrimaryMapper( Mappers.fromOwnerReferences(context.getPrimaryResourceClass())) .withLabelSelector(LABEL_KEY + "=" + LABEL_VALUE) - .build(), - context); + .build()); return List.of(ies); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primaryindexer/PrimaryIndexerTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primaryindexer/PrimaryIndexerTestReconciler.java index 8b3a5e044f..d011b86268 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primaryindexer/PrimaryIndexerTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primaryindexer/PrimaryIndexerTestReconciler.java @@ -49,6 +49,6 @@ public List> prepareEventSource .collect(Collectors.toSet())) .build(); - return List.of(new InformerEventSource<>(informerConfiguration, context)); + return List.of(new InformerEventSource<>(informerConfiguration)); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/JobReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/JobReconciler.java index a2a1b89ed1..ef2c26e19f 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/JobReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/primarytosecondary/JobReconciler.java @@ -123,7 +123,7 @@ public List> prepareEventSources(EventSourceContext con primary.getMetadata().getNamespace()))); } - return List.of(new InformerEventSource<>(informerConfiguration.build(), context)); + return List.of(new InformerEventSource<>(informerConfiguration.build())); } private String indexKey(String clusterName, String namespace) { diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/externalsecondaryupdate/ExternalSecondaryUpdateReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/externalsecondaryupdate/ExternalSecondaryUpdateReconciler.java index 0dac8cae33..bf5a6c3303 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/externalsecondaryupdate/ExternalSecondaryUpdateReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/externalsecondaryupdate/ExternalSecondaryUpdateReconciler.java @@ -102,8 +102,7 @@ public List> prepareEventS new InformerEventSource<>( InformerEventSourceConfiguration.from( ConfigMap.class, ExternalSecondaryUpdateCustomResource.class) - .build(), - context); + .build()); return List.of(configMapEventSource); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/onrelistfilter/OnRelistFilterReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/onrelistfilter/OnRelistFilterReconciler.java index 5f3ead43ff..80c2d92c26 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/onrelistfilter/OnRelistFilterReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/onrelistfilter/OnRelistFilterReconciler.java @@ -141,8 +141,7 @@ public List> prepareEventSources( new RelistAwareInformerEventSource<>( InformerEventSourceConfiguration.from( ConfigMap.class, OnRelistFilterCustomResource.class) - .build(), - context); + .build()); return List.of(configMapEventSource); } @@ -180,9 +179,8 @@ static class RelistAwareInformerEventSource latestReceivedVersion = new ConcurrentHashMap<>(); - RelistAwareInformerEventSource( - InformerEventSourceConfiguration configuration, EventSourceContext

context) { - super(configuration, context); + RelistAwareInformerEventSource(InformerEventSourceConfiguration configuration) { + super(configuration); } @Override diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/ownsecondaryupdate/OwnSecondaryUpdateReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/ownsecondaryupdate/OwnSecondaryUpdateReconciler.java index 8a95f6fed8..dee561ff10 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/ownsecondaryupdate/OwnSecondaryUpdateReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/ownsecondaryupdate/OwnSecondaryUpdateReconciler.java @@ -68,8 +68,7 @@ public List> prepareEventSource new InformerEventSource<>( InformerEventSourceConfiguration.from( ConfigMap.class, OwnSecondaryUpdateCustomResource.class) - .build(), - context); + .build()); return List.of(configMapEventSource); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/readownupdates/ReadOwnUpdatesReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/readownupdates/ReadOwnUpdatesReconciler.java index 545916d7f2..c62d637a88 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/readownupdates/ReadOwnUpdatesReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/readcacheafterwrite/readownupdates/ReadOwnUpdatesReconciler.java @@ -123,8 +123,7 @@ public List> prepareEventSources( new InformerEventSource<>( InformerEventSourceConfiguration.from( ConfigMap.class, ReadOwnUpdatesCustomResource.class) - .build(), - context); + .build()); configMapEventSource.addIndexers( Map.of(RESOURCE_VERSION_INDEX, cm -> List.of(cm.getMetadata().getResourceVersion()))); return List.of(configMapEventSource); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/resourceoperations/SecondaryResourceOperationsReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/resourceoperations/SecondaryResourceOperationsReconciler.java index 968046da27..16d7142899 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/resourceoperations/SecondaryResourceOperationsReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/resourceoperations/SecondaryResourceOperationsReconciler.java @@ -129,8 +129,7 @@ public List> prepareEv new InformerEventSource<>( InformerEventSourceConfiguration.from( ConfigMap.class, SecondaryResourceOperationsCustomResource.class) - .build(), - context); + .build()); return List.of(configMapEventSource); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/secondarytoprimaryreferencechange/TargetReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/secondarytoprimaryreferencechange/TargetReconciler.java index ee8d11e9d4..8e85241a51 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/secondarytoprimaryreferencechange/TargetReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/secondarytoprimaryreferencechange/TargetReconciler.java @@ -55,7 +55,7 @@ public List> prepareEventSources( .withSecondaryToPrimaryMapper(new ConfigToTargetMapper()) .build(); - var ies = new InformerEventSource<>(configuration, context); + var ies = new InformerEventSource(configuration); return List.of(ies); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestReconciler.java index 974427ba43..7ce8c21dfb 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/simple/TestReconciler.java @@ -133,8 +133,7 @@ public List> prepareEventSources( InformerEventSource es = new InformerEventSource<>( InformerEventSourceConfiguration.from(ConfigMap.class, TestCustomResource.class) - .build(), - context); + .build()); return List.of(es); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/startsecondaryaccess/StartupSecondaryAccessReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/startsecondaryaccess/StartupSecondaryAccessReconciler.java index ff2eb33bd5..c01505d0b8 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/startsecondaryaccess/StartupSecondaryAccessReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/startsecondaryaccess/StartupSecondaryAccessReconciler.java @@ -75,8 +75,7 @@ public List> prepareEventSo InformerEventSourceConfiguration.from( ConfigMap.class, StartupSecondaryAccessCustomResource.class) .withLabelSelector(LABEL_KEY + "=" + LABEL_VALUE) - .build(), - context); + .build()); return List.of(cmInformer); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateDependentReconciler.java index f8f2e23477..7e8ad5f8ff 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateDependentReconciler.java @@ -50,11 +50,10 @@ public int getNumberOfExecutions() { public List> prepareEventSources( EventSourceContext context) { var configMapEventSource = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from( ConfigMap.class, ExternalStateCustomResource.class) - .build(), - context); + .build()); return List.of(configMapEventSource); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateReconciler.java index 4f4cab80d7..51b3d24054 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/ExternalStateReconciler.java @@ -141,8 +141,7 @@ public List> prepareEventSources( new InformerEventSource<>( InformerEventSourceConfiguration.from( ConfigMap.class, ExternalStateCustomResource.class) - .build(), - context); + .build()); configMapEventSource.setEventSourcePriority(EventSourceStartPriority.RESOURCE_STATE_LOADER); final PerResourcePollingEventSource.ResourceFetcher< diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java index 365ac6bb7b..300c94e703 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java @@ -50,11 +50,10 @@ public int getNumberOfExecutions() { public List> prepareEventSources( EventSourceContext context) { var configMapEventSource = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from( ConfigMap.class, ExternalStateBulkDependentCustomResource.class) - .build(), - context); + .build()); return List.of(configMapEventSource); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresource/MultipleDependentResourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresource/MultipleDependentResourceReconciler.java index bc3129809f..b1e187dcd9 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresource/MultipleDependentResourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresource/MultipleDependentResourceReconciler.java @@ -54,8 +54,7 @@ public List> prepareEven new InformerEventSource<>( InformerEventSourceConfiguration.from( ConfigMap.class, MultipleDependentResourceCustomResource.class) - .build(), - context); + .build()); firstDependentResourceConfigMap.setEventSource(eventSource); secondDependentResourceConfigMap.setEventSource(eventSource); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresourcewithsametype/MultipleDependentResourceWithDiscriminatorReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresourcewithsametype/MultipleDependentResourceWithDiscriminatorReconciler.java index 93106451b3..2bc1d6bd30 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresourcewithsametype/MultipleDependentResourceWithDiscriminatorReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledependentresourcewithsametype/MultipleDependentResourceWithDiscriminatorReconciler.java @@ -66,8 +66,7 @@ public int getNumberOfExecutions() { InformerEventSourceConfiguration.from( ConfigMap.class, MultipleDependentResourceCustomResourceNoDiscriminator.class) - .build(), - context); + .build()); firstDependentResourceConfigMap.setEventSource(eventSource); secondDependentResourceConfigMap.setEventSource(eventSource); diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java index 21c6e39d6e..03425cdba0 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multipledrsametypenodiscriminator/MultipleManagedDependentSameTypeNoDiscriminatorReconciler.java @@ -71,8 +71,7 @@ public int getNumberOfExecutions() { InformerEventSourceConfiguration.from( ConfigMap.class, MultipleManagedDependentNoDiscriminatorCustomResource.class) .withName(CONFIG_MAP_EVENT_SOURCE) - .build(), - context); + .build()); return List.of(ies); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java index c792f81532..b26e76e458 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java @@ -70,8 +70,7 @@ public List> prep InformerEventSourceConfiguration.from( ConfigMap.class, MultipleManagedDependentResourceCustomResource.class) .withName(CONFIG_MAP_EVENT_SOURCE) - .build(), - context); + .build()); return List.of(ies); } } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primaryindexer/DependentPrimaryIndexerTestReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primaryindexer/DependentPrimaryIndexerTestReconciler.java index c4d61a1a29..49f49d7a69 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primaryindexer/DependentPrimaryIndexerTestReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primaryindexer/DependentPrimaryIndexerTestReconciler.java @@ -67,8 +67,7 @@ public List> prepareEventSource .stream() .map(ResourceID::fromResource) .collect(Collectors.toSet())) - .build(), - context); + .build()); return List.of(es); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java index 45b6777c88..37951c820e 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/primarytosecondaydependent/PrimaryToSecondaryDependentReconciler.java @@ -93,7 +93,7 @@ public List> prepareEv primary.getMetadata().getNamespace())))); var es = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from( ConfigMap.class, PrimaryToSecondaryDependentCustomResource.class) .withName(CONFIG_MAP_EVENT_SOURCE) @@ -120,8 +120,7 @@ public List> prepareEv .stream() .map(ResourceID::fromResource) .collect(Collectors.toSet())) - .build(), - context); + .build()); return List.of(es); } diff --git a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowReconciler.java b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowReconciler.java index f7ab9c08df..c491aa094a 100644 --- a/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowReconciler.java +++ b/operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/complexdependent/ComplexWorkflowReconciler.java @@ -89,15 +89,13 @@ public List> prepareEventSources( InformerEventSourceConfiguration.from( Service.class, ComplexWorkflowCustomResource.class) .withName(SERVICE_EVENT_SOURCE_NAME) - .build(), - context); + .build()); InformerEventSource statefulSetEventSource = new InformerEventSource<>( InformerEventSourceConfiguration.from( StatefulSet.class, ComplexWorkflowCustomResource.class) .withName(STATEFUL_SET_EVENT_SOURCE_NAME) - .build(), - context); + .build()); return List.of(serviceEventSource, statefulSetEventSource); } diff --git a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java index 9ab98d84c2..d254809864 100644 --- a/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java +++ b/sample-operators/tomcat-operator/src/main/java/io/javaoperatorsdk/operator/sample/WebappReconciler.java @@ -84,7 +84,7 @@ public List> prepareEventSources(EventSourceContext(configuration, context)); + return List.of(new InformerEventSource<>(configuration)); } /** diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java index eba68d9381..ab22e6f071 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageReconciler.java @@ -53,29 +53,25 @@ public WebPageReconciler() {} @Override public List> prepareEventSources(EventSourceContext context) { var configMapEventSource = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from(ConfigMap.class, WebPage.class) .withLabelSelector(SELECTOR) - .build(), - context); + .build()); var deploymentEventSource = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from(Deployment.class, WebPage.class) .withLabelSelector(SELECTOR) - .build(), - context); + .build()); var serviceEventSource = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from(Service.class, WebPage.class) .withLabelSelector(SELECTOR) - .build(), - context); + .build()); var ingressEventSource = - new InformerEventSource<>( + new InformerEventSource( InformerEventSourceConfiguration.from(Ingress.class, WebPage.class) .withLabelSelector(SELECTOR) - .build(), - context); + .build()); return List.of( configMapEventSource, deploymentEventSource, serviceEventSource, ingressEventSource); } From d244e20d44adf23aef4fb70d88cbc452af7a95d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Fri, 7 Aug 2026 11:05:52 +0200 Subject: [PATCH 2/2] Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> --- .../operator/api/config/ConfigurationServiceOverrider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java index 9b199341ac..557e6d60b7 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ConfigurationServiceOverrider.java @@ -183,7 +183,7 @@ public ConfigurationServiceOverrider withCloneSecondaryResourcesWhenGettingFromC * Overrides the informer pool strategy used to create/share the informers backing the event * sources. When not set, the default (informer-sharing) pool is used. * - *

Custom strategies extend {@link InformerPool}, which already takes care of creating and + *

Custom strategies implement {@link InformerPool}, which already takes care of creating and * starting the informers. */ @Experimental(