diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java index 8d7b232889..c9285e1cae 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfiguration.java @@ -249,6 +249,7 @@ public Long getInformerListLimit() { @SuppressWarnings("UnusedReturnValue") public class Builder { + /** For internal usage only. Use {@link #build()} method for building for InformerEventSource */ public InformerConfiguration buildForController() { // if the informer config uses the default "same as controller" value, reset the namespaces to // the default set for controllers @@ -261,7 +262,8 @@ public InformerConfiguration buildForController() { return InformerConfiguration.this; } - public InformerConfiguration buildForInformerEventSource() { + /** Build for InformerEventSource */ + public InformerConfiguration build() { if (namespaces == null || namespaces.isEmpty()) { namespaces = Constants.SAME_AS_CONTROLLER_NAMESPACES_SET; } 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 9ad6dded4c..ca40762e7a 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 @@ -219,7 +219,7 @@ public InformerEventSourceConfiguration build() { Objects.requireNonNullElse(secondaryToPrimaryMapper, Mappers.fromOwnerReferences(HasMetadata.getApiVersion(primaryResourceClass), HasMetadata.getKind(primaryResourceClass), false)), - config.buildForInformerEventSource(), kubernetesClient); + config.build(), kubernetesClient); } } } diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java index 3bfa8351d3..15cb4f172a 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java @@ -53,6 +53,6 @@ private InformerConfiguration createInformerConfig( configAnnotation.annotationType()); config = config.initFromAnnotation(informerConfig, context); } - return config.buildForInformerEventSource(); + return config.build(); } } diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java index 46ef56e1d4..21382adbd5 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java @@ -279,7 +279,7 @@ void replaceNamedDependentResourceConfigShouldWork() { final var overridingInformerConfig = InformerConfiguration.builder(ConfigMap.class) .withNamespaces(Set.of(overriddenNS)) .withLabelSelector(labelSelector) - .buildForInformerEventSource(); + .build(); final var overridden = ControllerConfigurationOverrider.override(configuration) .replacingNamedDependentResourceConfig( dependentResourceName, diff --git a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/InformerConfigurationTest.java b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/InformerConfigurationTest.java index 468c67e0d7..19fa6a324c 100644 --- a/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/InformerConfigurationTest.java +++ b/operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/InformerConfigurationTest.java @@ -48,7 +48,7 @@ void currentNamespaceWatched() { @Test void nullLabelSelectorByDefault() { final var informerConfig = - InformerConfiguration.builder(ConfigMap.class).buildForInformerEventSource(); + InformerConfiguration.builder(ConfigMap.class).build(); assertNull(informerConfig.getLabelSelector()); } @@ -61,7 +61,7 @@ void shouldWatchAllNamespacesByDefaultForControllers() { @Test void shouldFollowControllerNamespacesByDefaultForInformerEventSource() { final var informerConfig = - InformerConfiguration.builder(ConfigMap.class).buildForInformerEventSource(); + InformerConfiguration.builder(ConfigMap.class).build(); assertTrue(informerConfig.isFollowControllerNamespacesOnChange()); } diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java index 4dc75122f2..6adbeb03b5 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageDependentsWorkflowReconciler.java @@ -88,7 +88,7 @@ private void initDependentResources(KubernetesClient client) { .forEach(dr -> dr.configureWith(new KubernetesDependentResourceConfigBuilder() .withKubernetesDependentInformerConfig(InformerConfiguration.builder(dr.resourceType()) .withLabelSelector(DEPENDENT_RESOURCE_LABEL_SELECTOR) - .buildForInformerEventSource()) + .build()) .build())); } diff --git a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java index d2475b983f..b413e9ba53 100644 --- a/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java +++ b/sample-operators/webpage/src/main/java/io/javaoperatorsdk/operator/sample/WebPageStandaloneDependentsReconciler.java @@ -98,7 +98,7 @@ private Workflow createDependentResourcesAndWorkflow() { .forEach(dr -> dr.configureWith(new KubernetesDependentResourceConfigBuilder() .withKubernetesDependentInformerConfig(InformerConfiguration.builder(dr.resourceType()) .withLabelSelector(SELECTOR + "=true") - .buildForInformerEventSource()) + .build()) .build())); // connect the dependent resources into a workflow, configuring them as we go