Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: explicit workflow invovation cleanup issue #2680

Merged
merged 5 commits into from
Feb 5, 2025
Merged

fix: explicit workflow invovation cleanup issue #2680

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5887fbc
fix: explicit workflow invovation
csviri Feb 4, 2025
51f7d97
fix
csviri Feb 4, 2025
c2d039f
update
csviri Feb 4, 2025
9616c74
unit test
csviri Feb 5, 2025
8681ddc
improve
csviri Feb 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/Controller.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public DeleteControl execute() throws Exception {

// The cleanup is called also when explicit invocation is true, but the cleaner is not
// implemented
if (managedWorkflow.hasCleaner() || !explicitWorkflowInvocation) {
if (managedWorkflow.hasCleaner() && !explicitWorkflowInvocation) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

TBH, I miss the context here, but if I understand the comment above correctly it should be:

Suggested change
if (managedWorkflow.hasCleaner() && !explicitWorkflowInvocation) {
if (managedWorkflow.hasCleaner() || explicitWorkflowInvocation) {

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Updated the PR and also the comment. It's a bit more complicated than that.

workflowCleanupResult = managedWorkflow.cleanup(resource, context);
}

Expand Down
Loading