Skip to content

feat: @ControllerConfiguration not needed anymore #732

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

feat: @ControllerConfiguration not needed anymore #732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions ...nfig/runtime/AnnotationConfiguration.java → ...time/ClassAndAnnotationConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,20 @@
import io.javaoperatorsdk.operator.processing.event.source.ResourceEventFilter;
import io.javaoperatorsdk.operator.processing.event.source.ResourceEventFilters;

public class AnnotationConfiguration<R extends HasMetadata>
/**
* Reads the configuration from the @{@link ControllerConfiguration} annotation. If the annotation
* not presents still uses defaults from annotation.
*
* @param <R> class of the managed resource.
*/
public class ClassAndAnnotationConfiguration<R extends HasMetadata>
implements io.javaoperatorsdk.operator.api.config.ControllerConfiguration<R> {

private final Reconciler<R> reconciler;
private final ControllerConfiguration annotation;
private ConfigurationService service;

public AnnotationConfiguration(Reconciler<R> reconciler) {
public ClassAndAnnotationConfiguration(Reconciler<R> reconciler) {
this.reconciler = reconciler;
this.annotation = reconciler.getClass().getAnnotation(ControllerConfiguration.class);
}
Expand Down Expand Up @@ -81,7 +87,7 @@ public ResourceEventFilter<R> getEventFilter() {
Class<ResourceEventFilter<R>>[] filterTypes =
(Class<ResourceEventFilter<R>>[]) valueOrDefault(annotation,
ControllerConfiguration::eventFilters,
new Object[] {});
new Class[] {});
if (filterTypes.length > 0) {
for (var filterType : filterTypes) {
try {
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/io/javaoperatorsdk/operator/config/runtime/DefaultConfigurationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <R extends HasMetadata> ControllerConfiguration<R> getConfigurationFor(
if (config == null) {
if (createIfNeeded) {
// create the configuration on demand and register it
config = new AnnotationConfiguration<>(reconciler);
config = new ClassAndAnnotationConfiguration<>(reconciler);
register(config);
getLogger().info(
"Created configuration for controller {} with name {}",
Expand Down
2 changes: 0 additions & 2 deletions ...ava/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,10 @@
import org.slf4j.LoggerFactory;

import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;

@ControllerConfiguration
public class DoubleUpdateTestCustomReconciler
implements Reconciler<DoubleUpdateTestCustomResource>, TestExecutionInfoProvider {

Expand Down
2 changes: 0 additions & 2 deletions ...c/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,8 @@
import io.fabric8.kubernetes.client.CustomResource;
import io.javaoperatorsdk.operator.ControllerUtils;
import io.javaoperatorsdk.operator.api.reconciler.*;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;

@ControllerConfiguration
public class EventSourceTestCustomReconciler
implements Reconciler<EventSourceTestCustomResource>,
TestExecutionInfoProvider {
Expand Down
2 changes: 0 additions & 2 deletions ...ork/src/test/java/io/javaoperatorsdk/operator/sample/retry/RetryTestCustomReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,10 @@
import io.fabric8.kubernetes.client.CustomResource;
import io.javaoperatorsdk.operator.ControllerUtils;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;

@ControllerConfiguration
public class RetryTestCustomReconciler
implements Reconciler<RetryTestCustomResource>, TestExecutionInfoProvider {

Expand Down
3 changes: 1 addition & 2 deletions ...ples/common/src/main/java/io/javaoperatorsdk/operator/sample/CustomServiceReconciler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
import io.fabric8.kubernetes.client.KubernetesClient;
import io.javaoperatorsdk.operator.api.reconciler.*;
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;

/** A very simple sample controller that creates a service with a label. */
@ControllerConfiguration
// @ControllerConfiguration
public class CustomServiceReconciler implements Reconciler<CustomService> {

public static final String KIND = "CustomService";
Expand Down