Skip to content

Commit f8d3091

Browse files
metacosmmetacosm
committed
refactor: rename InformerConfig and associated field to Informer
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent f4950b2 commit f8d3091

File tree

34 files changed

+68
-68
lines changed

34 files changed

+68
-68
lines changed

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ private <P extends HasMetadata> ResolvedControllerConfiguration<P> controllerCon
276276
: fieldManager;
277277

278278
InformerConfigHolder<P> informerConfig = InformerConfigHolder.builder(resourceClass)
279-
.initFromAnnotation(annotation != null ? annotation.informerConfig() : null, context)
279+
.initFromAnnotation(annotation != null ? annotation.informer() : null, context)
280280
.buildForController();
281281

282282
return new ResolvedControllerConfiguration<P>(

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfig.java renamed to ‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/Informer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
@Retention(RetentionPolicy.RUNTIME)
2121
@Target({ElementType.TYPE})
22-
public @interface InformerConfig {
22+
public @interface Informer {
2323

2424
String name() default NO_VALUE_SET;
2525

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/informer/InformerConfigHolder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ public InformerConfigHolder<R> buildForInformerEventSource() {
134134
}
135135

136136
@SuppressWarnings({"unchecked"})
137-
public InformerConfigHolder<R>.Builder initFromAnnotation(InformerConfig informerConfig,
137+
public InformerConfigHolder<R>.Builder initFromAnnotation(Informer informerConfig,
138138
String context) {
139139
if (informerConfig != null) {
140140

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ControllerConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.lang.annotation.RetentionPolicy;
77
import java.lang.annotation.Target;
88

9-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
9+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
1010
import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
1111
import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
1212
import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
@@ -21,7 +21,7 @@
2121

2222
String name() default Constants.NO_VALUE_SET;
2323

24-
InformerConfig informerConfig() default @InformerConfig;
24+
Informer informer() default @Informer;
2525

2626
/**
2727
* Optional finalizer name, if it is not provided, one will be automatically generated. Note that

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependent.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import java.lang.annotation.RetentionPolicy;
66
import java.lang.annotation.Target;
77

8-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
8+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
99

1010

1111

@@ -30,6 +30,6 @@
3030
*/
3131
BooleanWithUndefined useSSA() default BooleanWithUndefined.UNDEFINED;
3232

33-
InformerConfig informerConfig() default @InformerConfig;
33+
Informer informer() default @Informer;
3434

3535
}

‎operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentConverter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ private InformerConfigHolder<R> createInformerConfig(
4545

4646
InformerConfigHolder<R>.Builder config = InformerConfigHolder.builder();
4747
if (configAnnotation != null) {
48-
final var informerConfig = configAnnotation.informerConfig();
48+
final var informerConfig = configAnnotation.informer();
4949
final var context = Utils.contextFor(controllerConfig, dependentResourceClass,
5050
configAnnotation.annotationType());
5151
config = config.initFromAnnotation(informerConfig, context);

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ControllerConfigurationOverriderTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import io.fabric8.kubernetes.client.informers.cache.BasicItemStore;
1212
import io.fabric8.kubernetes.client.informers.cache.Cache;
1313
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceConfigurationResolver;
14-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
14+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
1515
import io.javaoperatorsdk.operator.api.config.informer.InformerConfigHolder;
1616
import io.javaoperatorsdk.operator.api.reconciler.Constants;
1717
import io.javaoperatorsdk.operator.api.reconciler.Context;
@@ -304,7 +304,7 @@ public MyItemStore() {
304304
}
305305

306306
@ControllerConfiguration(
307-
informerConfig = @InformerConfig(namespaces = "foo", itemStore = MyItemStore.class))
307+
informer = @Informer(namespaces = "foo", itemStore = MyItemStore.class))
308308
private static class WatchCurrentReconciler implements Reconciler<ConfigMap> {
309309

310310
@Override
@@ -346,7 +346,7 @@ public boolean isMet(DependentResource<ConfigMap, ConfigMap> dependentResource,
346346
@Workflow(dependents = @Dependent(type = ReadOnlyDependent.class,
347347
readyPostcondition = TestCondition.class))
348348
@ControllerConfiguration(
349-
informerConfig = @InformerConfig(namespaces = OneDepReconciler.CONFIGURED_NS))
349+
informer = @Informer(namespaces = OneDepReconciler.CONFIGURED_NS))
350350
private static class OneDepReconciler implements Reconciler<ConfigMap> {
351351

352352
private static final String CONFIGURED_NS = "foo";
@@ -366,7 +366,7 @@ public ReadOnlyDependent() {
366366
}
367367

368368
@KubernetesDependent(
369-
informerConfig = @InformerConfig(namespaces = Constants.WATCH_ALL_NAMESPACES))
369+
informer = @Informer(namespaces = Constants.WATCH_ALL_NAMESPACES))
370370
public static class WatchAllNSDependent
371371
extends KubernetesDependentResource<ConfigMap, ConfigMap>
372372
implements GarbageCollected<ConfigMap> {
@@ -378,7 +378,7 @@ public WatchAllNSDependent() {
378378

379379
@Workflow(dependents = @Dependent(type = OverriddenNSDependent.class))
380380
@ControllerConfiguration(
381-
informerConfig = @InformerConfig(namespaces = OverriddenNSOnDepReconciler.CONFIGURED_NS))
381+
informer = @Informer(namespaces = OverriddenNSOnDepReconciler.CONFIGURED_NS))
382382
public static class OverriddenNSOnDepReconciler implements Reconciler<ConfigMap> {
383383

384384
private static final String CONFIGURED_NS = "parentNS";
@@ -389,7 +389,7 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
389389
}
390390
}
391391

392-
@KubernetesDependent(informerConfig = @InformerConfig(namespaces = OverriddenNSDependent.DEP_NS))
392+
@KubernetesDependent(informer = @Informer(namespaces = OverriddenNSDependent.DEP_NS))
393393
public static class OverriddenNSDependent
394394
extends KubernetesDependentResource<ConfigMap, ConfigMap>
395395
implements GarbageCollected<ConfigMap> {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
import java.util.concurrent.atomic.AtomicInteger;
44

55
import io.fabric8.kubernetes.api.model.Service;
6-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
6+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
77
import io.javaoperatorsdk.operator.api.reconciler.*;
88

9-
@ControllerConfiguration(informerConfig = @InformerConfig(labelSelector = "builtintest=true"))
9+
@ControllerConfiguration(informer = @Informer(labelSelector = "builtintest=true"))
1010
public class BuiltInResourceCleanerReconciler
1111
implements Reconciler<Service>, Cleaner<Service> {
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
import io.fabric8.kubernetes.api.model.apps.Deployment;
1010
import io.fabric8.kubernetes.api.model.apps.DeploymentCondition;
1111
import io.fabric8.kubernetes.api.model.apps.DeploymentStatus;
12-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
12+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
1313
import io.javaoperatorsdk.operator.api.reconciler.Context;
1414
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
1515
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
1616
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
1717
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1818

1919
@ControllerConfiguration(
20-
informerConfig = @InformerConfig(labelSelector = "test=KubernetesResourceStatusUpdateIT"))
20+
informer = @Informer(labelSelector = "test=KubernetesResourceStatusUpdateIT"))
2121
public class DeploymentReconciler
2222
implements Reconciler<Deployment>, TestExecutionInfoProvider {
2323

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
import io.fabric8.kubernetes.api.model.ConfigMap;
88
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
9-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
9+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
1010
import io.javaoperatorsdk.operator.api.config.informer.InformerEventSourceConfiguration;
1111
import io.javaoperatorsdk.operator.api.reconciler.Context;
1212
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -16,7 +16,7 @@
1616
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
1717
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1818

19-
@ControllerConfiguration(informerConfig = @InformerConfig(onUpdateFilter = UpdateFilter.class))
19+
@ControllerConfiguration(informer = @Informer(onUpdateFilter = UpdateFilter.class))
2020
public class FilterTestReconciler
2121
implements Reconciler<FilterTestCustomResource> {
2222

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
import java.util.concurrent.atomic.AtomicInteger;
44

5-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
5+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
66
import io.javaoperatorsdk.operator.api.reconciler.*;
77
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
88

99
import static io.javaoperatorsdk.operator.baseapi.labelselector.LabelSelectorTestReconciler.LABEL_KEY;
1010
import static io.javaoperatorsdk.operator.baseapi.labelselector.LabelSelectorTestReconciler.LABEL_VALUE;
1111

1212
@ControllerConfiguration(
13-
informerConfig = @InformerConfig(labelSelector = LABEL_KEY + "=" + LABEL_VALUE))
13+
informer = @Informer(labelSelector = LABEL_KEY + "=" + LABEL_VALUE))
1414
public class LabelSelectorTestReconciler
1515
implements Reconciler<LabelSelectorTestCustomResource>, TestExecutionInfoProvider {
1616

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import java.util.concurrent.atomic.AtomicInteger;
44

5-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
5+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
66
import io.javaoperatorsdk.operator.api.reconciler.*;
77
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
88

9-
@ControllerConfiguration(informerConfig = @InformerConfig(labelSelector = "reconciler = 1"))
9+
@ControllerConfiguration(informer = @Informer(labelSelector = "reconciler = 1"))
1010
public class MultipleReconcilerSameTypeReconciler1
1111
implements Reconciler<MultipleReconcilerSameTypeCustomResource>, TestExecutionInfoProvider {
1212

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22

33
import java.util.concurrent.atomic.AtomicInteger;
44

5-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
5+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
66
import io.javaoperatorsdk.operator.api.reconciler.Context;
77
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
88
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
99
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
1010
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1111

12-
@ControllerConfiguration(informerConfig = @InformerConfig(labelSelector = "reconciler != 1"))
12+
@ControllerConfiguration(informer = @Informer(labelSelector = "reconciler != 1"))
1313
public class MultipleReconcilerSameTypeReconciler2
1414
implements Reconciler<MultipleReconcilerSameTypeCustomResource>, TestExecutionInfoProvider {
1515

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
6+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
77
import io.javaoperatorsdk.operator.api.reconciler.Context;
88
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
99
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
1010
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
1111

12-
@ControllerConfiguration(informerConfig = @InformerConfig(labelSelector = "!version"))
12+
@ControllerConfiguration(informer = @Informer(labelSelector = "!version"))
1313
public class MultiVersionCRDTestReconciler1
1414
implements Reconciler<MultiVersionCRDTestCustomResource1> {
1515

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
import org.slf4j.Logger;
44
import org.slf4j.LoggerFactory;
55

6-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
6+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
77
import io.javaoperatorsdk.operator.api.reconciler.Context;
88
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
99
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
1010
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
1111

12-
@ControllerConfiguration(informerConfig = @InformerConfig(labelSelector = "version in (v2)"))
12+
@ControllerConfiguration(informer = @Informer(labelSelector = "version in (v2)"))
1313
public class MultiVersionCRDTestReconciler2
1414
implements Reconciler<MultiVersionCRDTestCustomResource2> {
1515

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/config/BaseConfigurationServiceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import io.javaoperatorsdk.operator.api.config.dependent.ConfigurationConverter;
2020
import io.javaoperatorsdk.operator.api.config.dependent.Configured;
2121
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
22-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
22+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
2323
import io.javaoperatorsdk.operator.api.reconciler.Constants;
2424
import io.javaoperatorsdk.operator.api.reconciler.Context;
2525
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
@@ -252,7 +252,7 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
252252

253253
@Workflow(dependents = @Dependent(type = ReadOnlyDependent.class))
254254
@ControllerConfiguration(
255-
informerConfig = @InformerConfig(namespaces = OneDepReconciler.CONFIGURED_NS))
255+
informer = @Informer(namespaces = OneDepReconciler.CONFIGURED_NS))
256256
private static class OneDepReconciler implements Reconciler<ConfigMap> {
257257

258258
private static final String CONFIGURED_NS = "foo";

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentfilter/DependentFilterTestReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import java.util.concurrent.atomic.AtomicInteger;
44

5-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
5+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
66
import io.javaoperatorsdk.operator.api.reconciler.*;
77
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
88

99
@Workflow(dependents = {@Dependent(type = FilteredDependentConfigMap.class)})
10-
@ControllerConfiguration(informerConfig = @InformerConfig(onUpdateFilter = UpdateFilter.class))
10+
@ControllerConfiguration(informer = @Informer(onUpdateFilter = UpdateFilter.class))
1111
public class DependentFilterTestReconciler
1212
implements Reconciler<DependentFilterTestCustomResource> {
1313

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentfilter/FilteredDependentConfigMap.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
import io.fabric8.kubernetes.api.model.ConfigMap;
66
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
7-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
7+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
88
import io.javaoperatorsdk.operator.api.reconciler.Context;
99
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
1010
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
1111

1212
import static io.javaoperatorsdk.operator.dependent.dependentfilter.DependentFilterTestReconciler.CM_VALUE_KEY;
1313

14-
@KubernetesDependent(informerConfig = @InformerConfig(onUpdateFilter = UpdateFilter.class))
14+
@KubernetesDependent(informer = @Informer(onUpdateFilter = UpdateFilter.class))
1515
public class FilteredDependentConfigMap
1616
extends CRUDKubernetesDependentResource<ConfigMap, DependentFilterTestCustomResource> {
1717

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentoperationeventfiltering/DependentOperationEventFilterCustomResourceTestReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.concurrent.atomic.AtomicInteger;
44

5-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
5+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
66
import io.javaoperatorsdk.operator.api.reconciler.*;
77
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
88
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
@@ -11,7 +11,7 @@
1111
@Dependent(type = ConfigMapDependentResource.class)
1212
})
1313
@ControllerConfiguration(
14-
informerConfig = @InformerConfig(namespaces = Constants.WATCH_CURRENT_NAMESPACE))
14+
informer = @Informer(namespaces = Constants.WATCH_CURRENT_NAMESPACE))
1515
public class DependentOperationEventFilterCustomResourceTestReconciler
1616
implements Reconciler<DependentOperationEventFilterCustomResource>,
1717
TestExecutionInfoProvider {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/informerrelatedbehavior/ConfigMapDependentResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import io.fabric8.kubernetes.api.model.ConfigMap;
66
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
77
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
8-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
8+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
99
import io.javaoperatorsdk.operator.api.reconciler.Context;
1010
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
1111
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
1212

13-
@KubernetesDependent(informerConfig = @InformerConfig(labelSelector = "app=rbac-test"))
13+
@KubernetesDependent(informer = @Informer(labelSelector = "app=rbac-test"))
1414
public class ConfigMapDependentResource
1515
extends CRUDKubernetesDependentResource<ConfigMap, InformerRelatedBehaviorTestCustomResource> {
1616

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/restart/ConfigMapDependentResource.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
import io.fabric8.kubernetes.api.model.ConfigMap;
66
import io.fabric8.kubernetes.api.model.ConfigMapBuilder;
77
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
8-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
8+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
99
import io.javaoperatorsdk.operator.api.reconciler.Context;
1010
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDKubernetesDependentResource;
1111
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
1212

13-
@KubernetesDependent(informerConfig = @InformerConfig(labelSelector = "app=restart-test"))
13+
@KubernetesDependent(informer = @Informer(labelSelector = "app=restart-test"))
1414
public class ConfigMapDependentResource
1515
extends CRUDKubernetesDependentResource<ConfigMap, RestartTestCustomResource> {
1616

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/specialresourcesdependent/SpecialResourceTestReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import java.util.concurrent.atomic.AtomicInteger;
44

5-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
5+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
66
import io.javaoperatorsdk.operator.api.reconciler.*;
77
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
88
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
@@ -11,7 +11,7 @@
1111
@Dependent(type = ServiceAccountDependentResource.class),
1212
})
1313
@ControllerConfiguration(
14-
informerConfig = @InformerConfig(namespaces = Constants.WATCH_CURRENT_NAMESPACE))
14+
informer = @Informer(namespaces = Constants.WATCH_CURRENT_NAMESPACE))
1515
public class SpecialResourceTestReconciler
1616
implements Reconciler<SpecialResourceCustomResource>,
1717
TestExecutionInfoProvider {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/workflow/multipledependentwithactivation/ConfigMapDependentResource1.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44

55
import io.fabric8.kubernetes.api.model.ConfigMap;
66
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
7-
import io.javaoperatorsdk.operator.api.config.informer.InformerConfig;
7+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
88
import io.javaoperatorsdk.operator.api.reconciler.Context;
99
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDNoGCKubernetesDependentResource;
1010
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
1111

12-
@KubernetesDependent(informerConfig = @InformerConfig(name = "configMapInformer"))
12+
@KubernetesDependent(informer = @Informer(name = "configMapInformer"))
1313
public class ConfigMapDependentResource1
1414
extends
1515
CRUDNoGCKubernetesDependentResource<ConfigMap, MultipleDependentActivationCustomResource> {

0 commit comments

Comments
 (0)