Skip to content

Commit fd6fd40

Browse files
committed
fix: DependentResourceNode must use spec name when available
1 parent d59922e commit fd6fd40

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,8 @@ public Workflow<P> resolve(KubernetesClient client,
7474
ControllerConfiguration<P> configuration) {
7575
final var alreadyResolved = new HashMap<String, DependentResourceNode>(specs.size());
7676
for (DependentResourceSpec spec : specs) {
77-
final var node = new DependentResourceNode(resolve(spec, client, configuration));
77+
final var node =
78+
new DependentResourceNode(spec.getName(), resolve(spec, client, configuration));
7879
alreadyResolved.put(node.getName(), node);
7980
spec.getDependsOn()
8081
.forEach(depend -> node.addDependsOnRelation(alreadyResolved.get((String) depend)));

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ void addParent(DependentResourceNode parent) {
2626
parents.add(parent);
2727
}
2828

29-
3029
void addDependsOnRelation(DependentResourceNode node) {
3130
node.addParent(this);
3231
dependsOn.add(node);
@@ -92,16 +91,13 @@ public int hashCode() {
9291
}
9392

9493

95-
public DependentResourceNode(DependentResource<R, P> dependentResource) {
96-
this(dependentResource, null, null);
94+
DependentResourceNode(DependentResource<R, P> dependentResource) {
95+
this(getNameFor(dependentResource), dependentResource);
9796
}
9897

99-
public DependentResourceNode(DependentResource<R, P> dependentResource,
100-
Condition<R, P> reconcilePrecondition, Condition<R, P> deletePostcondition) {
101-
this.name = getNameFor(dependentResource);
98+
DependentResourceNode(String name, DependentResource<R, P> dependentResource) {
99+
this.name = name;
102100
setDependentResource(dependentResource);
103-
setReconcilePrecondition(reconcilePrecondition);
104-
setDeletePostcondition(deletePostcondition);
105101
}
106102

107103
@SuppressWarnings("rawtypes")

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ public WorkflowBuilder<P> withDeletePostcondition(Condition deletePostcondition)
6161
return this;
6262
}
6363

64-
DependentResourceNode getNodeByDependentResource(
65-
DependentResource<?, ?> dependentResource) {
64+
DependentResourceNode getNodeByDependentResource(DependentResource<?, ?> dependentResource) {
6665
// first check by name
6766
final var node =
6867
dependentResourceNodes.get(DependentResourceNode.getNameFor(dependentResource));

0 commit comments

Comments
 (0)