Skip to content

Commit 8964fff

Browse files
committed
fix: workflows don't need to record the configuration service
1 parent 4fb68af commit 8964fff

File tree

4 files changed

+5
-20
lines changed

4 files changed

+5
-20
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultManagedWorkflow.java

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

99
import io.fabric8.kubernetes.api.model.HasMetadata;
1010
import io.fabric8.kubernetes.client.KubernetesClient;
11-
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
1211
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
1312
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
1413
import io.javaoperatorsdk.operator.api.reconciler.dependent.DependentResource;
@@ -24,11 +23,8 @@ public class DefaultManagedWorkflow<P extends HasMetadata> implements ManagedWor
2423
private final Set<String> bottomLevelResources;
2524
private final List<DependentResourceSpec> orderedSpecs;
2625
private final boolean hasCleaner;
27-
private final ConfigurationService configurationService;
2826

29-
protected DefaultManagedWorkflow(List<DependentResourceSpec> orderedSpecs,
30-
boolean hasCleaner, ConfigurationService configurationService) {
31-
this.configurationService = configurationService;
27+
protected DefaultManagedWorkflow(List<DependentResourceSpec> orderedSpecs, boolean hasCleaner) {
3228
this.hasCleaner = hasCleaner;
3329
topLevelResources = new HashSet<>(orderedSpecs.size());
3430
bottomLevelResources = orderedSpecs.stream()
@@ -104,7 +100,7 @@ private <R> DependentResource<R, P> resolve(DependentResourceSpec<R, P> spec,
104100
KubernetesClient client,
105101
ControllerConfiguration<P> configuration) {
106102
final DependentResource<R, P> dependentResource =
107-
configurationService.dependentResourceFactory()
103+
configuration.getConfigurationService().dependentResourceFactory()
108104
.createFrom(spec, configuration);
109105

110106
if (dependentResource instanceof KubernetesClientAware) {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowFactory.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@ public Workflow resolve(KubernetesClient client, ControllerConfiguration configu
2626
}
2727
};
2828
}
29-
ManagedWorkflowSupport support =
30-
new ManagedWorkflowSupport(configuration.getConfigurationService());
29+
ManagedWorkflowSupport support = new ManagedWorkflowSupport();
3130
return support.createWorkflow(dependentResourceSpecs);
3231
};
3332

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowSupport.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,11 @@
1111

1212
import io.fabric8.kubernetes.api.model.HasMetadata;
1313
import io.javaoperatorsdk.operator.OperatorException;
14-
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
1514
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
1615

1716
@SuppressWarnings({"rawtypes", "unchecked"})
1817
class ManagedWorkflowSupport {
1918

20-
private ConfigurationService configurationService;
21-
22-
public ManagedWorkflowSupport(ConfigurationService configurationService) {
23-
this.configurationService = configurationService;
24-
}
25-
2619
public void checkForNameDuplication(List<DependentResourceSpec> dependentResourceSpecs) {
2720
if (dependentResourceSpecs == null) {
2821
return;
@@ -55,8 +48,7 @@ <P extends HasMetadata> DefaultManagedWorkflow<P> createAsDefault(
5548
List<DependentResourceSpec> dependentResourceSpecs) {
5649
final boolean[] cleanerHolder = {false};
5750
var orderedResourceSpecs = orderAndDetectCycles(dependentResourceSpecs, cleanerHolder);
58-
return new DefaultManagedWorkflow<>(orderedResourceSpecs, cleanerHolder[0],
59-
configurationService);
51+
return new DefaultManagedWorkflow<>(orderedResourceSpecs, cleanerHolder[0]);
6052
}
6153

6254
/**

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/dependent/workflow/ManagedWorkflowSupportTest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import org.junit.jupiter.api.Test;
1010

1111
import io.javaoperatorsdk.operator.OperatorException;
12-
import io.javaoperatorsdk.operator.api.config.BaseConfigurationService;
1312
import io.javaoperatorsdk.operator.api.config.dependent.DependentResourceSpec;
1413

1514
import static io.javaoperatorsdk.operator.processing.dependent.workflow.ManagedWorkflowTestUtils.createDRS;
@@ -22,8 +21,7 @@ class ManagedWorkflowSupportTest {
2221
public static final String NAME_3 = "name3";
2322
public static final String NAME_4 = "name4";
2423

25-
ManagedWorkflowSupport managedWorkflowSupport =
26-
new ManagedWorkflowSupport(new BaseConfigurationService());
24+
ManagedWorkflowSupport managedWorkflowSupport = new ManagedWorkflowSupport();
2725

2826
@Test
2927
void trivialCasesNameDuplicates() {

0 commit comments

Comments
 (0)