wip: attempt to simplify workflows handling #2555

metacosm · 2024-10-18T17:32:10Z

refactor: remove now unneeded NameSetter interface
refactor: simplify workflow handling
refactor: initial work to combine ManagedWorkflow and regular one

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

* feat: move name is directly to dependent resource - use this name when throwing aggregate exception Signed-off-by: Attila Mészáros <csviri@gmail.com> * refactor to use a dedicated interface for setting the name Signed-off-by: Attila Mészáros <csviri@gmail.com> * refactor: add default implementation for name() (#2255) Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com> --------- Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Chris Laprun <claprun@redhat.com> Co-authored-by: Chris Laprun <metacosm@users.noreply.github.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Chris Laprun <claprun@redhat.com> Co-authored-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com>

…2308) Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com>

…ed (#2297) Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com>

…2321) Fixes #2311 Overriding getPrimaryResourceType should allow to make things work even in deeper hierarchies. Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

) Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

* imporve diff logging Signed-off-by: bachmanity1 <bachmanity138@gmail.com> * compute diff only when actual doesn't match desired Signed-off-by: bachmanity1 <bachmanity138@gmail.com> * slight improvements Signed-off-by: bachmanity1 <bachmanity138@gmail.com> * increase context size Signed-off-by: bachmanity1 <bachmanity138@gmail.com> * fix style Signed-off-by: bachmanity1 <bachmanity138@gmail.com> * calculate diff only if debug is enabled Signed-off-by: bachmanity1 <bachmanity138@gmail.com> * print actual resources when trace is enabled Signed-off-by: bachmanity1 <bachmanity138@gmail.com> * use java-diff-utils Signed-off-by: bachmanity1 <bachmanity138@gmail.com> * add unit tests --------- Signed-off-by: bachmanity1 <bachmanity138@gmail.com>

Signed-off-by: Chris Laprun <claprun@redhat.com>

* feat(build): split ITs by category, parallel CRD generation Also avoid generating CRDs when not needed by default, summarizes test results. * chore(deps): bump actions-setup-minikube to 2.13.0 * feat: default to use vertx client * chore(ci): reduce tested combinations, only run client tests on baseapi * fix: increase deletion timeout --------- Signed-off-by: Chris Laprun <claprun@redhat.com>

Signed-off-by: Chris Laprun <claprun@redhat.com>

xstefank

Other than todos I don't see anything wrong.

xstefank · 2024-10-22T06:47:34Z

...n/java/io/javaoperatorsdk/operator/processing/dependent/workflow/DefaultManagedWorkflow.java

    }
+
+    this.workflow = new DefaultWorkflow<>(alreadyResolved.values(), false, hasCleaner);
+    this.orderedSpecs = orderedSpecs; // todo: remove


I don't understand these todos in this class. Do you still plan to work on them in this PR?

csviri · 2024-10-25T10:52:35Z

@metacosm I would prefer to review this together, I fail to see how this simplifies things.

csviri · 2024-10-25T10:57:27Z

Might be also better to do such refactorings step by step with limited scoped PR- if possible.

metacosm · 2024-10-26T08:57:41Z

This isn't done yet so, indeed, this doesn't really simplify things at the moment… also, I'm not sure the individual steps will make any difference since they will only make sense once the whole is completed (if it can actually be achieved as expected, which I'm not yet sure of as this is still rather exploratory).

Signed-off-by: Chris Laprun <claprun@redhat.com>

metacosm · 2024-11-05T20:41:24Z

Replaced by #2566

csviri and others added 30 commits October 10, 2024 10:42

chore: set version to 5.0.0-SNAPSHOT (#2200)

ee91509

Signed-off-by: Attila Mészáros <csviri@gmail.com>

improve: java version minimal 11, tested on 21 (#2207)

623bd0c

Signed-off-by: Attila Mészáros <csviri@gmail.com>

improve: remove deprecated EventFilter (#2208)

034295a

Signed-off-by: Attila Mészáros <csviri@gmail.com>

docs: 5.0 migration guide skeleton (#2210)

a27f561

Signed-off-by: Attila Mészáros <csviri@gmail.com>

improve: managed dependent reconciliation results not optional (#2212)

937edfb

Signed-off-by: Attila Mészáros <csviri@gmail.com>

improve: remove deprecated RetryConfiguration (#2211)

dc92d22

Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: JDK client is now the default (#2235)

c307fa4

Signed-off-by: Attila Mészáros <csviri@gmail.com>

fix: update SCM information (#2237)

c037f2a

Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

format

e847a30

Signed-off-by: Attila Mészáros <csviri@gmail.com>

fix: test after rebase on master (#2270)

54a1e76

Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: use java 17 as baseline (#2271)

ac73110

Signed-off-by: Attila Mészáros <csviri@gmail.com>

improve: matcher always considers metadata (#2273)

595199f

Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: API to check if next reconciliation is imminent (#2272)

91c554f

Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: Workflow extracted to a separate annotation (#2274)

9e725c3

Signed-off-by: Attila Mészáros <csviri@gmail.com>

fix: pom properties cleanup (#2280)

713f9ea

Signed-off-by: Attila Mészáros <csviri@gmail.com>

improve: remove EventSourceInitializer (#2257)

93b1679

Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Chris Laprun <claprun@redhat.com> Co-authored-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

refactor: make loadFromProperties private (#2287)

8d6a648

Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: distinguish resources based on desired state (#2252)

bbf0fbe

Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: explicit workflow invocation (#2289)

e5f15dc

Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: use ssa for status update by default from UpdateControl (#2278)

07ec082

Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

refactor: make WorkflowSpec an interface (#2300)

04678c6

Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

improve: replace current formatting plugins with spotless plugin (#2302)

639b439

Signed-off-by: Attila Mészáros <csviri@gmail.com>

refactor: make ManagedWorkflowSupport public to be able to reuse it (#…

c161b8b

…2308) Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

fix: package fix leader election sample (#2303)

2f3c453

Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: remove resource discriminator (#2299)

45d68bf

Signed-off-by: Attila Mészáros <csviri@gmail.com>

refactor: remove deprecated getTerminationTimeoutSeconds and associat…

cad5d1d

…ed (#2297) Signed-off-by: Chris Laprun <claprun@redhat.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

improve: additional logging to mysql schema e2e test (#2320)

1ea47c5

Signed-off-by: Attila Mészáros <csviri@gmail.com>

feat: using SSA for finalizer and primary patch (#2305)

21e12ad

Signed-off-by: Attila Mészáros <csviri@gmail.com> Signed-off-by: Attila Mészáros <csviri@gmail.com>

csviri and others added 11 commits October 10, 2024 11:25

fix: cleanup after rebase on main

755091c

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

feat: context getSecondary resource is activation condition aware (#2532

1b7b2d5

) Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

feat: e2e test to demonstrate namespace deletion problem fix (#2528)

1189f24

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

docs: remove javadoc todos (#2541)

417de6d

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

feat: print diff resource as yaml (#2542)

d3390c9

fix: integration test timeout issue (#2547)

48c36c1

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

improve: naming target resource selector method (#2546)

0be0f42

fix: race condition in workflow reconciler (#2549)

3dd77c1

Signed-off-by: Chris Laprun <claprun@redhat.com>

refactor: rename method more appropriately (#2554)

e8d44c4

Signed-off-by: Chris Laprun <claprun@redhat.com>

metacosm self-assigned this Oct 18, 2024

metacosm requested review from csviri and xstefank October 18, 2024 17:32

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 18, 2024

xstefank reviewed Oct 22, 2024

View reviewed changes

improve: workflow builder naming (#2559)

81d0773

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 28, 2024

metacosm added 3 commits October 30, 2024 09:41

refactor: remove now unneeded NameSetter interface

49cce14

Signed-off-by: Chris Laprun <claprun@redhat.com>

refactor: simplify workflow handling

7f9403e

Signed-off-by: Chris Laprun <claprun@redhat.com>

refactor: initial work to combine ManagedWorkflow and regular one

798fb2b

Signed-off-by: Chris Laprun <claprun@redhat.com>

metacosm force-pushed the clean-workflows branch from 3ea6a8e to 798fb2b Compare October 30, 2024 13:58

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 30, 2024

metacosm force-pushed the next branch from 81d0773 to ac22888 Compare November 5, 2024 19:03

metacosm closed this Nov 5, 2024

metacosm deleted the clean-workflows branch November 12, 2024 14:59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

wip: attempt to simplify workflows handling #2555

wip: attempt to simplify workflows handling #2555

Uh oh!

metacosm commented Oct 18, 2024

Uh oh!

xstefank left a comment

Uh oh!

xstefank Oct 22, 2024

Uh oh!

csviri commented Oct 25, 2024

Uh oh!

csviri commented Oct 25, 2024

Uh oh!

metacosm commented Oct 26, 2024

Uh oh!

metacosm commented Nov 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

wip: attempt to simplify workflows handling #2555

wip: attempt to simplify workflows handling #2555

Uh oh!

Conversation

metacosm commented Oct 18, 2024

Uh oh!

xstefank left a comment

Choose a reason for hiding this comment

Uh oh!

xstefank Oct 22, 2024

Choose a reason for hiding this comment

Uh oh!

csviri commented Oct 25, 2024

Uh oh!

csviri commented Oct 25, 2024

Uh oh!

metacosm commented Oct 26, 2024

Uh oh!

metacosm commented Nov 5, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants