Skip to content

Commit 155e0e8

Browse files
csviricsviri
committed
feat: introduce @workflow annoation
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent f8441d9 commit 155e0e8

File tree

44 files changed

+163
-94
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+163
-94
lines changed

‎bootstrapper-maven-plugin/src/main/resources/templates/Reconciler.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,17 @@
1111
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
1212
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
1313
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
14+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
1415
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
1516
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1617

1718
import java.util.Map;
1819
import java.util.Optional;
1920

20-
@ControllerConfiguration(dependents = {@Dependent(type = ConfigMapDependentResource.class)})
21+
@ControllerConfiguration(
22+
workflow = @Workflow(dependents = {
23+
@Dependent(type = ConfigMapDependentResource.class)
24+
}))
2125
public class {{artifactClassId}}Reconciler implements Reconciler<{{artifactClassId}}CustomResource> {
2226

2327
public UpdateControl<{{artifactClassId}}CustomResource> reconcile({{artifactClassId}}CustomResource primary,

‎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
@@ -173,7 +173,7 @@ private static List<DependentResourceSpec> dependentResources(
173173
ControllerConfiguration<?> parent) {
174174
final var dependents =
175175
valueOrDefault(annotation,
176-
io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration::dependents,
176+
c -> c.workflow().dependents(),
177177
new Dependent[] {});
178178
if (dependents.length == 0) {
179179
return Collections.emptyList();

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

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

99
import io.fabric8.kubernetes.client.informers.cache.ItemStore;
10-
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
10+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
1111
import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
1212
import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
1313
import io.javaoperatorsdk.operator.processing.event.source.cache.BoundedItemStore;
@@ -94,13 +94,7 @@ MaxReconciliationInterval maxReconciliationInterval() default @MaxReconciliation
9494
interval = MaxReconciliationInterval.DEFAULT_INTERVAL);
9595

9696

97-
/**
98-
* Optional list of {@link Dependent} configurations which associate a resource type to a
99-
* {@link io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource} implementation
100-
*
101-
* @return the array of {@link Dependent} configurations
102-
*/
103-
Dependent[] dependents() default {};
97+
Workflow workflow() default @Workflow(dependents = {});
10498

10599
/**
106100
* Optional {@link Retry} implementation for the associated controller to use.

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package io.javaoperatorsdk.operator.api.reconciler.workflow;
2+
3+
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
4+
5+
public @interface Workflow {
6+
7+
/**
8+
* List of {@link Dependent} configurations which associate a resource type to a
9+
* {@link io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource} implementation
10+
*
11+
* @return the array of {@link Dependent} configurations
12+
*/
13+
Dependent[] dependents();
14+
15+
}

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

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
2121
import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
2222
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
23+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
2324
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
2425
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
2526
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
@@ -68,10 +69,10 @@ void overridingNSShouldPreserveUntouchedDependents() {
6869
assertEquals(stringConfig, resourceConfig);
6970
}
7071

71-
@ControllerConfiguration(dependents = {
72+
@ControllerConfiguration(workflow = @Workflow(dependents = {
7273
@Dependent(type = NamedDependentReconciler.NamedDependentResource.class),
7374
@Dependent(type = NamedDependentReconciler.ExternalDependentResource.class)
74-
})
75+
}))
7576
private static class NamedDependentReconciler implements Reconciler<ConfigMap> {
7677

7778
@Override
@@ -366,7 +367,8 @@ void replaceNamedDependentResourceConfigShouldWork() {
366367
assertTrue(dependentSpec.getReadyCondition() instanceof TestCondition);
367368
}
368369

369-
@ControllerConfiguration(dependents = @Dependent(type = ReadOnlyDependent.class))
370+
@ControllerConfiguration(
371+
workflow = @Workflow(dependents = @Dependent(type = ReadOnlyDependent.class)))
370372
private static class WatchAllNamespacesReconciler implements Reconciler<ConfigMap> {
371373

372374
@Override
@@ -375,7 +377,8 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
375377
}
376378
}
377379

378-
@ControllerConfiguration(dependents = @Dependent(type = WatchAllNSDependent.class))
380+
@ControllerConfiguration(
381+
workflow = @Workflow(dependents = @Dependent(type = WatchAllNSDependent.class)))
379382
private static class DependentWatchesAllNSReconciler implements Reconciler<ConfigMap> {
380383

381384
@Override
@@ -395,8 +398,8 @@ public boolean isMet(DependentResource<ConfigMap, ConfigMap> dependentResource,
395398
}
396399

397400
@ControllerConfiguration(namespaces = OneDepReconciler.CONFIGURED_NS,
398-
dependents = @Dependent(type = ReadOnlyDependent.class,
399-
readyPostcondition = TestCondition.class))
401+
workflow = @Workflow(dependents = @Dependent(type = ReadOnlyDependent.class,
402+
readyPostcondition = TestCondition.class)))
400403
private static class OneDepReconciler implements Reconciler<ConfigMap> {
401404

402405
private static final String CONFIGURED_NS = "foo";
@@ -424,7 +427,7 @@ public WatchAllNSDependent() {
424427
}
425428

426429
@ControllerConfiguration(namespaces = OverriddenNSOnDepReconciler.CONFIGURED_NS,
427-
dependents = @Dependent(type = OverriddenNSDependent.class))
430+
workflow = @Workflow(dependents = @Dependent(type = OverriddenNSDependent.class)))
428431
private static class OverriddenNSOnDepReconciler implements Reconciler<ConfigMap> {
429432

430433
private static final String CONFIGURED_NS = "parentNS";

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
2121
import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
2222
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
23+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
2324
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentConverter;
2425
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
2526

@@ -125,12 +126,12 @@ public Object configFrom(Annotation configAnnotation,
125126
assertEquals(overriddenConverter, converter);
126127
}
127128

128-
@ControllerConfiguration(dependents = {
129+
@ControllerConfiguration(workflow = @Workflow(dependents = {
129130
@Dependent(type = CustomAnnotatedDep.class, name = DR_NAME),
130131
@Dependent(type = ChildCustomAnnotatedDep.class),
131132
@Dependent(type = ConfigMapDep.class),
132133
@Dependent(type = ServiceDep.class)
133-
})
134+
}))
134135
static class CustomAnnotationReconciler implements Reconciler<ConfigMap> {
135136

136137
public static final String DR_NAME = "first";

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

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
3232
import io.javaoperatorsdk.operator.api.reconciler.dependent.ReconcileResult;
3333
import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DependentResourceConfigurator;
34+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
3435
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
3536
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
3637
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResourceConfig;
@@ -254,7 +255,7 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
254255
}
255256

256257
@ControllerConfiguration(namespaces = OneDepReconciler.CONFIGURED_NS,
257-
dependents = @Dependent(type = ReadOnlyDependent.class))
258+
workflow = @Workflow(dependents = @Dependent(type = ReadOnlyDependent.class)))
258259
private static class OneDepReconciler implements Reconciler<ConfigMap> {
259260

260261
private static final String CONFIGURED_NS = "foo";
@@ -266,7 +267,8 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
266267
}
267268

268269
@ControllerConfiguration(
269-
dependents = @Dependent(type = ReadOnlyDependent.class, name = NamedDepReconciler.NAME))
270+
workflow = @Workflow(
271+
dependents = @Dependent(type = ReadOnlyDependent.class, name = NamedDepReconciler.NAME)))
270272
private static class NamedDepReconciler implements Reconciler<ConfigMap> {
271273

272274
private static final String NAME = "foo";
@@ -278,10 +280,10 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
278280
}
279281

280282
@ControllerConfiguration(
281-
dependents = {
283+
workflow = @Workflow(dependents = {
282284
@Dependent(type = ReadOnlyDependent.class),
283285
@Dependent(type = ReadOnlyDependent.class)
284-
})
286+
}))
285287
private static class DuplicatedDepReconciler implements Reconciler<ConfigMap> {
286288

287289
@Override
@@ -291,10 +293,10 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
291293
}
292294

293295
@ControllerConfiguration(
294-
dependents = {
296+
workflow = @Workflow(dependents = {
295297
@Dependent(type = ReadOnlyDependent.class, name = NamedDuplicatedDepReconciler.NAME),
296298
@Dependent(type = ReadOnlyDependent.class)
297-
})
299+
}))
298300
private static class NamedDuplicatedDepReconciler implements Reconciler<ConfigMap> {
299301

300302
private static final String NAME = "duplicated";
@@ -314,10 +316,10 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
314316
}
315317
}
316318

317-
@ControllerConfiguration(dependents = {
319+
@ControllerConfiguration(workflow = @Workflow(dependents = {
318320
@Dependent(type = SelectorReconciler.WithAnnotation.class),
319321
@Dependent(type = ReadOnlyDependent.class)
320-
})
322+
}))
321323
private static class SelectorReconciler implements Reconciler<ConfigMap> {
322324

323325
@Override
@@ -438,10 +440,10 @@ public UpdateControl<ConfigMap> reconcile(ConfigMap resource, Context<ConfigMap>
438440
}
439441
}
440442

441-
@ControllerConfiguration(dependents = {
443+
@ControllerConfiguration(workflow = @Workflow(dependents = {
442444
@Dependent(type = CustomAnnotatedDep.class),
443445
@Dependent(type = ChildCustomAnnotatedDep.class)
444-
})
446+
}))
445447
private static class CustomAnnotationReconciler implements Reconciler<ConfigMap> {
446448

447449
@Override

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedBulkDependentReconciler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
88
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
99
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
10+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
1011

11-
@ControllerConfiguration(dependents = @Dependent(type = CRUDConfigMapBulkDependentResource.class))
12+
@ControllerConfiguration(
13+
workflow = @Workflow(dependents = @Dependent(type = CRUDConfigMapBulkDependentResource.class)))
1214
public class ManagedBulkDependentReconciler
1315
implements Reconciler<BulkDependentTestCustomResource> {
1416

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedBulkDependentWithReadyConditionReconciler.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@
77
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
88
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
99
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
10+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
11+
import io.javaoperatorsdk.operator.processing.dependent.workflow.WorkflowReconcileResult;
1012

11-
@ControllerConfiguration(dependents = @Dependent(readyPostcondition = SampleBulkCondition.class,
12-
type = CRUDConfigMapBulkDependentResource.class))
13+
@ControllerConfiguration(
14+
workflow = @Workflow(dependents = @Dependent(readyPostcondition = SampleBulkCondition.class,
15+
type = CRUDConfigMapBulkDependentResource.class)))
1316
public class ManagedBulkDependentWithReadyConditionReconciler
1417
implements Reconciler<BulkDependentTestCustomResource> {
1518

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/ManagedDeleterBulkReconciler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
66
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
77
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
8+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
89

910
@ControllerConfiguration(
10-
dependents = @Dependent(type = ConfigMapDeleterBulkDependentResource.class))
11+
workflow = @Workflow(
12+
dependents = @Dependent(type = ConfigMapDeleterBulkDependentResource.class)))
1113
public class ManagedDeleterBulkReconciler implements Reconciler<BulkDependentTestCustomResource> {
1214
@Override
1315
public UpdateControl<BulkDependentTestCustomResource> reconcile(

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/bulkdependent/external/ExternalBulkResourceReconciler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
66
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
77
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
8+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
89
import io.javaoperatorsdk.operator.sample.bulkdependent.BulkDependentTestCustomResource;
910

10-
@ControllerConfiguration(dependents = @Dependent(type = ExternalBulkDependentResource.class))
11+
@ControllerConfiguration(
12+
workflow = @Workflow(dependents = @Dependent(type = ExternalBulkDependentResource.class)))
1113
public class ExternalBulkResourceReconciler implements Reconciler<BulkDependentTestCustomResource> {
1214

1315
@Override

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/cleanermanageddependent/CleanerForManagedDependentTestReconciler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,11 @@
44

55
import io.javaoperatorsdk.operator.api.reconciler.*;
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
7+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
78
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
89

9-
@ControllerConfiguration(dependents = {@Dependent(type = ConfigMapDependentResource.class)})
10+
@ControllerConfiguration(
11+
workflow = @Workflow(dependents = {@Dependent(type = ConfigMapDependentResource.class)}))
1012
public class CleanerForManagedDependentTestReconciler
1113
implements Reconciler<CleanerForManagedDependentCustomResource>,
1214
TestExecutionInfoProvider {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/complexdependent/ComplexDependentReconciler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
99
import io.javaoperatorsdk.operator.api.reconciler.*;
1010
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
11+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
1112
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
1213
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1314
import io.javaoperatorsdk.operator.sample.complexdependent.dependent.*;
@@ -17,7 +18,7 @@
1718

1819
@ControllerConfiguration(
1920
name = "project-operator",
20-
dependents = {
21+
workflow = @Workflow(dependents = {
2122
@Dependent(name = "first-svc", type = FirstService.class,
2223
useEventSourceWithName = SERVICE_EVENT_SOURCE_NAME),
2324
@Dependent(name = "second-svc", type = SecondService.class,
@@ -31,7 +32,7 @@
3132
useEventSourceWithName = STATEFUL_SET_EVENT_SOURCE_NAME,
3233
dependsOn = {"second-svc", "first"},
3334
readyPostcondition = StatefulSetReadyCondition.class),
34-
})
35+
}))
3536
public class ComplexDependentReconciler implements Reconciler<ComplexDependentCustomResource>,
3637
EventSourceInitializer<ComplexDependentCustomResource> {
3738

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createonlyifnotexistsdependentwithssa/CreateOnlyIfNotExistingDependentWithSSAReconciler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
88
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
99
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
10+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
1011

11-
@ControllerConfiguration(dependents = {
12-
@Dependent(type = ConfigMapDependentResource.class)})
12+
@ControllerConfiguration(workflow = @Workflow(dependents = {
13+
@Dependent(type = ConfigMapDependentResource.class)}))
1314
public class CreateOnlyIfNotExistingDependentWithSSAReconciler
1415
implements Reconciler<CreateOnlyIfNotExistingDependentWithSSACustomResource> {
1516

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentannotationsecondarymapper/DependentAnnotationSecondaryMapperReconciler.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
import io.javaoperatorsdk.operator.api.reconciler.*;
99
import io.javaoperatorsdk.operator.api.reconciler.dependent.Deleter;
1010
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
11+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
1112
import io.javaoperatorsdk.operator.processing.dependent.Creator;
1213
import io.javaoperatorsdk.operator.processing.dependent.Updater;
1314
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
1415
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1516

16-
@ControllerConfiguration(dependents = @Dependent(
17-
type = DependentAnnotationSecondaryMapperReconciler.ConfigMapDependentResource.class))
17+
@ControllerConfiguration(workflow = @Workflow(dependents = @Dependent(
18+
type = DependentAnnotationSecondaryMapperReconciler.ConfigMapDependentResource.class)))
1819
public class DependentAnnotationSecondaryMapperReconciler
1920
implements Reconciler<DependentAnnotationSecondaryMapperResource>, TestExecutionInfoProvider {
2021

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentcustommappingannotation/DependentCustomMappingReconciler.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22

33
import io.javaoperatorsdk.operator.api.reconciler.*;
44
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
5+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
56

67
@ControllerConfiguration(
7-
dependents = {@Dependent(type = CustomMappingConfigMapDependentResource.class)})
8+
workflow = @Workflow(
9+
dependents = {@Dependent(type = CustomMappingConfigMapDependentResource.class)}))
810
public class DependentCustomMappingReconciler
911
implements Reconciler<DependentCustomMappingCustomResource> {
1012

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentdifferentnamespace/DependentDifferentNamespaceReconciler.java

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

55
import io.javaoperatorsdk.operator.api.reconciler.*;
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
7+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
78
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
89

910
@ControllerConfiguration(
10-
dependents = {
11+
workflow = @Workflow(dependents = {
1112
@Dependent(type = ConfigMapDependentResource.class),
12-
})
13+
}))
1314
public class DependentDifferentNamespaceReconciler
1415
implements Reconciler<DependentDifferentNamespaceCustomResource>,
1516
TestExecutionInfoProvider {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@
44

55
import io.javaoperatorsdk.operator.api.reconciler.*;
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
7+
import io.javaoperatorsdk.operator.api.reconciler.workflow.Workflow;
78

89
@ControllerConfiguration(onUpdateFilter = UpdateFilter.class,
9-
dependents = {@Dependent(type = FilteredDependentConfigMap.class)})
10+
workflow = @Workflow(dependents = {@Dependent(type = FilteredDependentConfigMap.class)}))
1011
public class DependentFilterTestReconciler
1112
implements Reconciler<DependentFilterTestCustomResource> {
1213

0 commit comments

Comments
 (0)