Skip to content

Commit 0fe0f33

Browse files
csviricsviri
committed
refactor to use workflow everywhere
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent 510887d commit 0fe0f33

File tree

41 files changed

+135
-183
lines changed

Some content is hidden

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

41 files changed

+135
-183
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,15 @@
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;
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+
@Workflow(dependents = {@Dependent(type = ConfigMapDependentResource.class)})
22+
@ControllerConfiguration
2123
public class {{artifactClassId}}Reconciler implements Reconciler<{{artifactClassId}}CustomResource> {
2224

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

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ default RateLimiter getRateLimiter() {
6363
return DEFAULT_RATE_LIMITER;
6464
}
6565

66-
// todo might be better with Optional?
6766
default Optional<WorkflowSpec> getWorkflowSpec() {
6867
return Optional.empty();
6968
}

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
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;
1110
import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
1211
import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
1312
import io.javaoperatorsdk.operator.processing.event.source.cache.BoundedItemStore;
@@ -93,16 +92,6 @@
9392
MaxReconciliationInterval maxReconciliationInterval() default @MaxReconciliationInterval(
9493
interval = MaxReconciliationInterval.DEFAULT_INTERVAL);
9594

96-
97-
// todo remove
98-
/**
99-
* Optional list of {@link Dependent} configurations which associate a resource type to a
100-
* {@link io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource} implementation
101-
*
102-
* @return the array of {@link Dependent} configurations
103-
*/
104-
Dependent[] dependents() default {};
105-
10695
/**
10796
* Optional {@link Retry} implementation for the associated controller to use.
10897
*

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

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

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

5-
import io.javaoperatorsdk.operator.api.reconciler.Context;
6-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
7-
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
8-
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
5+
import io.javaoperatorsdk.operator.api.reconciler.*;
96
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
107

11-
@ControllerConfiguration(dependents = @Dependent(type = CRUDConfigMapBulkDependentResource.class))
8+
@Workflow(dependents = @Dependent(type = CRUDConfigMapBulkDependentResource.class))
9+
@ControllerConfiguration
1210
public class ManagedBulkDependentReconciler
1311
implements Reconciler<BulkDependentTestCustomResource> {
1412

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

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

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

5-
import io.javaoperatorsdk.operator.api.reconciler.Context;
6-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
7-
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
8-
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
5+
import io.javaoperatorsdk.operator.api.reconciler.*;
96
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
107

11-
@ControllerConfiguration(dependents = @Dependent(readyPostcondition = SampleBulkCondition.class,
8+
@Workflow(dependents = @Dependent(readyPostcondition = SampleBulkCondition.class,
129
type = CRUDConfigMapBulkDependentResource.class))
10+
@ControllerConfiguration()
1311
public class ManagedBulkDependentWithReadyConditionReconciler
1412
implements Reconciler<BulkDependentTestCustomResource> {
1513

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
package io.javaoperatorsdk.operator.sample.bulkdependent;
22

3-
import io.javaoperatorsdk.operator.api.reconciler.Context;
4-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
5-
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
6-
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
3+
import io.javaoperatorsdk.operator.api.reconciler.*;
74
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
85

9-
@ControllerConfiguration(
10-
dependents = @Dependent(type = ConfigMapDeleterBulkDependentResource.class))
6+
@Workflow(dependents = @Dependent(type = ConfigMapDeleterBulkDependentResource.class))
7+
@ControllerConfiguration
118
public class ManagedDeleterBulkReconciler implements Reconciler<BulkDependentTestCustomResource> {
129
@Override
1310
public UpdateControl<BulkDependentTestCustomResource> reconcile(

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
11
package io.javaoperatorsdk.operator.sample.bulkdependent.external;
22

3-
import io.javaoperatorsdk.operator.api.reconciler.Context;
4-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
5-
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
6-
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
3+
import io.javaoperatorsdk.operator.api.reconciler.*;
74
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
85
import io.javaoperatorsdk.operator.sample.bulkdependent.BulkDependentTestCustomResource;
96

10-
@ControllerConfiguration(dependents = @Dependent(type = ExternalBulkDependentResource.class))
7+
@Workflow(dependents = @Dependent(type = ExternalBulkDependentResource.class))
8+
@ControllerConfiguration()
119
public class ExternalBulkResourceReconciler implements Reconciler<BulkDependentTestCustomResource> {
1210

1311
@Override

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
77
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
88

9-
@ControllerConfiguration(dependents = {@Dependent(type = ConfigMapDependentResource.class)})
9+
@Workflow(dependents = {@Dependent(type = ConfigMapDependentResource.class)})
10+
@ControllerConfiguration
1011
public class CleanerForManagedDependentTestReconciler
1112
implements Reconciler<CleanerForManagedDependentCustomResource>,
1213
TestExecutionInfoProvider {

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,22 @@
1515
import static io.javaoperatorsdk.operator.sample.complexdependent.ComplexDependentReconciler.SERVICE_EVENT_SOURCE_NAME;
1616
import static io.javaoperatorsdk.operator.sample.complexdependent.ComplexDependentReconciler.STATEFUL_SET_EVENT_SOURCE_NAME;
1717

18-
@ControllerConfiguration(
19-
name = "project-operator",
20-
dependents = {
21-
@Dependent(name = "first-svc", type = FirstService.class,
22-
useEventSourceWithName = SERVICE_EVENT_SOURCE_NAME),
23-
@Dependent(name = "second-svc", type = SecondService.class,
24-
useEventSourceWithName = SERVICE_EVENT_SOURCE_NAME),
25-
@Dependent(name = "first", type = FirstStatefulSet.class,
26-
useEventSourceWithName = STATEFUL_SET_EVENT_SOURCE_NAME,
27-
dependsOn = {"first-svc"},
28-
readyPostcondition = StatefulSetReadyCondition.class),
29-
@Dependent(name = "second",
30-
type = SecondStatefulSet.class,
31-
useEventSourceWithName = STATEFUL_SET_EVENT_SOURCE_NAME,
32-
dependsOn = {"second-svc", "first"},
33-
readyPostcondition = StatefulSetReadyCondition.class),
34-
})
18+
@Workflow(dependents = {
19+
@Dependent(name = "first-svc", type = FirstService.class,
20+
useEventSourceWithName = SERVICE_EVENT_SOURCE_NAME),
21+
@Dependent(name = "second-svc", type = SecondService.class,
22+
useEventSourceWithName = SERVICE_EVENT_SOURCE_NAME),
23+
@Dependent(name = "first", type = FirstStatefulSet.class,
24+
useEventSourceWithName = STATEFUL_SET_EVENT_SOURCE_NAME,
25+
dependsOn = {"first-svc"},
26+
readyPostcondition = StatefulSetReadyCondition.class),
27+
@Dependent(name = "second",
28+
type = SecondStatefulSet.class,
29+
useEventSourceWithName = STATEFUL_SET_EVENT_SOURCE_NAME,
30+
dependsOn = {"second-svc", "first"},
31+
readyPostcondition = StatefulSetReadyCondition.class),
32+
})
33+
@ControllerConfiguration(name = "project-operator")
3534
public class ComplexDependentReconciler implements Reconciler<ComplexDependentCustomResource>,
3635
EventSourceInitializer<ComplexDependentCustomResource> {
3736

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

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

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

5-
import io.javaoperatorsdk.operator.api.reconciler.Context;
6-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
7-
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
8-
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
5+
import io.javaoperatorsdk.operator.api.reconciler.*;
96
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
107

11-
@ControllerConfiguration(dependents = {
8+
@Workflow(dependents = {
129
@Dependent(type = ConfigMapDependentResource.class)})
10+
@ControllerConfiguration()
1311
public class CreateOnlyIfNotExistingDependentWithSSAReconciler
1412
implements Reconciler<CreateOnlyIfNotExistingDependentWithSSACustomResource> {
1513

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependentResource;
1414
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1515

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import io.javaoperatorsdk.operator.api.reconciler.*;
44
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
55

6-
@ControllerConfiguration(
7-
dependents = {@Dependent(type = CustomMappingConfigMapDependentResource.class)})
6+
@Workflow(dependents = {@Dependent(type = CustomMappingConfigMapDependentResource.class)})
7+
@ControllerConfiguration
88
public class DependentCustomMappingReconciler
99
implements Reconciler<DependentCustomMappingCustomResource> {
1010

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
77
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
88

9-
@ControllerConfiguration(
10-
dependents = {
11-
@Dependent(type = ConfigMapDependentResource.class),
12-
})
9+
@Workflow(dependents = {
10+
@Dependent(type = ConfigMapDependentResource.class),
11+
})
12+
@ControllerConfiguration
1313
public class DependentDifferentNamespaceReconciler
1414
implements Reconciler<DependentDifferentNamespaceCustomResource>,
1515
TestExecutionInfoProvider {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
import io.javaoperatorsdk.operator.api.reconciler.*;
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
77

8-
@ControllerConfiguration(onUpdateFilter = UpdateFilter.class,
9-
dependents = {@Dependent(type = FilteredDependentConfigMap.class)})
8+
@Workflow(dependents = {@Dependent(type = FilteredDependentConfigMap.class)})
9+
@ControllerConfiguration(onUpdateFilter = UpdateFilter.class)
1010
public class DependentFilterTestReconciler
1111
implements Reconciler<DependentFilterTestCustomResource> {
1212

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
77
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
88

9-
@ControllerConfiguration(
10-
namespaces = Constants.WATCH_CURRENT_NAMESPACE,
11-
dependents = {
12-
@Dependent(type = ConfigMapDependentResource.class),
13-
})
9+
@Workflow(dependents = {
10+
@Dependent(type = ConfigMapDependentResource.class)
11+
})
12+
@ControllerConfiguration(namespaces = Constants.WATCH_CURRENT_NAMESPACE)
1413
public class DependentOperationEventFilterCustomResourceTestReconciler
1514
implements Reconciler<DependentOperationEventFilterCustomResource>,
1615
TestExecutionInfoProvider {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/dependentresourcecrossref/DependentResourceCrossRefReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,12 @@
1414

1515
import static io.javaoperatorsdk.operator.sample.dependentresourcecrossref.DependentResourceCrossRefReconciler.SECRET_NAME;
1616

17-
@ControllerConfiguration(dependents = {
17+
@Workflow(dependents = {
1818
@Dependent(name = SECRET_NAME,
1919
type = DependentResourceCrossRefReconciler.SecretDependentResource.class),
2020
@Dependent(type = DependentResourceCrossRefReconciler.ConfigMapDependentResource.class,
2121
dependsOn = SECRET_NAME)})
22+
@ControllerConfiguration
2223
public class DependentResourceCrossRefReconciler
2324
implements Reconciler<DependentResourceCrossRefResource>,
2425
ErrorStatusHandler<DependentResourceCrossRefResource> {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/ExternalStateDependentReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1212
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1313

14-
@ControllerConfiguration(
15-
dependents = @Dependent(type = ExternalWithStateDependentResource.class))
14+
@Workflow(dependents = @Dependent(type = ExternalWithStateDependentResource.class))
15+
@ControllerConfiguration
1616
public class ExternalStateDependentReconciler
1717
implements Reconciler<ExternalStateCustomResource>,
1818
EventSourceInitializer<ExternalStateCustomResource>,

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/externalstate/externalstatebulkdependent/ExternalStateBulkDependentReconciler.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,14 @@
55

66
import io.fabric8.kubernetes.api.model.ConfigMap;
77
import io.javaoperatorsdk.operator.api.config.informer.InformerConfiguration;
8-
import io.javaoperatorsdk.operator.api.reconciler.Context;
9-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
10-
import io.javaoperatorsdk.operator.api.reconciler.EventSourceContext;
11-
import io.javaoperatorsdk.operator.api.reconciler.EventSourceInitializer;
12-
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
13-
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
8+
import io.javaoperatorsdk.operator.api.reconciler.*;
149
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
1510
import io.javaoperatorsdk.operator.processing.event.source.EventSource;
1611
import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
1712
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1813

19-
@ControllerConfiguration(
20-
dependents = @Dependent(type = BulkDependentResourceExternalWithState.class))
14+
@Workflow(dependents = @Dependent(type = BulkDependentResourceExternalWithState.class))
15+
@ControllerConfiguration
2116
public class ExternalStateBulkDependentReconciler
2217
implements Reconciler<ExternalStateBulkDependentCustomResource>,
2318
EventSourceInitializer<ExternalStateBulkDependentCustomResource>,

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/generickubernetesresource/generickubernetesdependentresourcemanaged/GenericKubernetesDependentManagedReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import io.javaoperatorsdk.operator.api.reconciler.*;
44
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
55

6-
@ControllerConfiguration(
7-
dependents = {@Dependent(type = ConfigMapGenericKubernetesDependent.class)})
6+
@Workflow(dependents = {@Dependent(type = ConfigMapGenericKubernetesDependent.class)})
7+
@ControllerConfiguration
88
public class GenericKubernetesDependentManagedReconciler
99
implements Reconciler<GenericKubernetesDependentManagedCustomResource> {
1010

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/informerrelatedbehavior/InformerRelatedBehaviorTestReconciler.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,16 @@
66
import org.slf4j.LoggerFactory;
77

88
import io.fabric8.kubernetes.client.KubernetesClient;
9-
import io.javaoperatorsdk.operator.api.reconciler.Context;
10-
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
11-
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
12-
import io.javaoperatorsdk.operator.api.reconciler.UpdateControl;
9+
import io.javaoperatorsdk.operator.api.reconciler.*;
1310
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
1411
import io.javaoperatorsdk.operator.processing.event.ResourceID;
1512
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
1613

14+
@Workflow(dependents = @Dependent(
15+
name = InformerRelatedBehaviorTestReconciler.CONFIG_MAP_DEPENDENT_RESOURCE,
16+
type = ConfigMapDependentResource.class))
1717
@ControllerConfiguration(
18-
name = InformerRelatedBehaviorTestReconciler.INFORMER_RELATED_BEHAVIOR_TEST_RECONCILER,
19-
dependents = @Dependent(
20-
name = InformerRelatedBehaviorTestReconciler.CONFIG_MAP_DEPENDENT_RESOURCE,
21-
type = ConfigMapDependentResource.class))
18+
name = InformerRelatedBehaviorTestReconciler.INFORMER_RELATED_BEHAVIOR_TEST_RECONCILER)
2219
public class InformerRelatedBehaviorTestReconciler
2320
implements Reconciler<InformerRelatedBehaviorTestCustomResource>, TestExecutionInfoProvider {
2421

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/manageddependentdeletecondition/ManagedDependentDefaultDeleteConditionReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@
77
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
88
import io.javaoperatorsdk.operator.processing.dependent.workflow.KubernetesResourceDeletedCondition;
99

10-
@ControllerConfiguration(dependents = {
10+
@Workflow(dependents = {
1111
@Dependent(name = "ConfigMap", type = ConfigMapDependent.class),
1212
@Dependent(type = SecretDependent.class, dependsOn = "ConfigMap",
1313
deletePostcondition = KubernetesResourceDeletedCondition.class)
1414
})
15+
@ControllerConfiguration
1516
public class ManagedDependentDefaultDeleteConditionReconciler
1617
implements Reconciler<ManagedDependentDefaultDeleteConditionCustomResource> {
1718

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multipledependentsametypemultiinformer/MultipleManagedDependentResourceMultiInformerReconciler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
import io.javaoperatorsdk.operator.api.reconciler.dependent.Dependent;
77
import io.javaoperatorsdk.operator.support.TestExecutionInfoProvider;
88

9-
@ControllerConfiguration(dependents = {
9+
@Workflow(dependents = {
1010
@Dependent(name = MultipleManagedDependentResourceMultiInformerReconciler.CONFIG_MAP_1_DR,
1111
type = MultipleManagedDependentResourceMultiInformerConfigMap1.class),
1212
@Dependent(name = MultipleManagedDependentResourceMultiInformerReconciler.CONFIG_MAP_2_DR,
1313
type = MultipleManagedDependentResourceMultiInformerConfigMap2.class)
1414
})
15+
@ControllerConfiguration
1516
public class MultipleManagedDependentResourceMultiInformerReconciler
1617
implements Reconciler<MultipleManagedDependentResourceMultiInformerCustomResource>,
1718
TestExecutionInfoProvider {
1819

19-
public static final String CONFIG_MAP_EVENT_SOURCE = "ConfigMapEventSource";
2020
public static final String DATA_KEY = "key";
2121
public static final String CONFIG_MAP_1_DR = "ConfigMap1";
2222
public static final String CONFIG_MAP_2_DR = "ConfigMap2";

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanageddependentsametype/MultipleManagedDependentResourceReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,13 @@
1313

1414
import static io.javaoperatorsdk.operator.sample.multiplemanageddependentsametype.MultipleManagedDependentResourceReconciler.CONFIG_MAP_EVENT_SOURCE;
1515

16-
@ControllerConfiguration(dependents = {
16+
@Workflow(dependents = {
1717
@Dependent(type = MultipleManagedDependentResourceConfigMap1.class,
1818
useEventSourceWithName = CONFIG_MAP_EVENT_SOURCE),
1919
@Dependent(type = MultipleManagedDependentResourceConfigMap2.class,
2020
useEventSourceWithName = CONFIG_MAP_EVENT_SOURCE)
2121
})
22+
@ControllerConfiguration
2223
public class MultipleManagedDependentResourceReconciler
2324
implements Reconciler<MultipleManagedDependentResourceCustomResource>,
2425
TestExecutionInfoProvider,

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/multiplemanagedexternaldependenttype/MultipleManagedExternalDependentResourceReconciler.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,13 @@
1717

1818
import static io.javaoperatorsdk.operator.sample.multiplemanagedexternaldependenttype.MultipleManagedExternalDependentResourceReconciler.CONFIG_MAP_EVENT_SOURCE;
1919

20-
@ControllerConfiguration(dependents = {
20+
@Workflow(dependents = {
2121
@Dependent(type = ExternalDependentResource1.class,
2222
useEventSourceWithName = CONFIG_MAP_EVENT_SOURCE),
2323
@Dependent(type = ExternalDependentResource2.class,
2424
useEventSourceWithName = CONFIG_MAP_EVENT_SOURCE)
2525
})
26+
@ControllerConfiguration()
2627
public class MultipleManagedExternalDependentResourceReconciler
2728
implements Reconciler<MultipleManagedExternalDependentResourceCustomResource>,
2829
TestExecutionInfoProvider,

0 commit comments

Comments
 (0)