feat: component version resolution service#1055

Merged

jakobmoellerdev merged 25 commits into

open-component-model:mainfrom

Skarlso:migrate-config-and-context-part-2

Oct 29, 2025

Skarlso commented Oct 17, 2025 •

edited

Loading

Contributor

What this PR does / why we need it

TODOs:

Cache key invalidation and TTL

Part of open-component-model/ocm-project#692.

Which issue(s) this PR fixes

github-actions Bot added kind/feature size/l labels

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 20cc2d8 to a6064a1 Compare

October 17, 2025 12:00


          feat: component version resolution service

f17bee2

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

remove error results from the cache and return them

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 8b3f151 to f17bee2 Compare

October 17, 2025 13:49

fabianburth reviewed

View reviewed changes

kubernetes/controller/resolution/service.go Outdated

kubernetes/controller/internal/resolution/service.go Outdated

kubernetes/controller/internal/resolution/service.go Outdated

kubernetes/controller/internal/resolution/service.go Outdated

kubernetes/controller/internal/resolution/service.go Outdated

kubernetes/controller/internal/resolution/workers.go Outdated

kubernetes/controller/internal/resolution/workers.go Outdated

Skarlso added 3 commits

October 17, 2025 20:45


          cache is now behind an interface

c32e956

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>


          fixed the worker restart and extracted the singleflight method

ac83e70

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>


          refactor the entire resolution worker logic to use channel dynamics

eca896b

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 530b966 to 1728e0a Compare

October 19, 2025 12:08


          resolution has been moved out because it is being started by the cont…

ec423ab

…roller

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 1728e0a to ec423ab Compare

October 19, 2025 12:12


          trying to refactor and extract the worker pool from the resolver logic

1e14431

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso commented Oct 19, 2025

Contributor Author

I had two implementations. The current one is a second implementation attempt I'm trying. I extracted the workerpool from the resolver. The resolver is really thin. While the workpool has most of the logic of resolving. Hope this is a bit clearer now. :)


          added a giant test case

7b5071a

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

matthiasbruns reviewed

View reviewed changes

kubernetes/controller/internal/resolution/cache.go Outdated

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 5ee1f0a to 4ad0679 Compare

October 20, 2025 06:29


          a couple of small fixes to workerqueue and shutdown sequence

f71c0b6

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 4ad0679 to f71c0b6 Compare

October 20, 2025 06:36


          adding ttl

72b77ec

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from a35f112 to 48196e4 Compare

October 21, 2025 14:29


          remove inprogress and put singleflight into the upper level

d9cb4e4

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 48196e4 to d9cb4e4 Compare

October 21, 2025 14:37

Skarlso commented

View reviewed changes

kubernetes/controller/internal/resolution/cache.go Outdated

jakobmoellerdev reviewed

View reviewed changes

kubernetes/controller/Dockerfile Outdated

jakobmoellerdev reviewed

View reviewed changes

kubernetes/controller/internal/resolution/types.go

Skarlso and others added 4 commits

October 24, 2025 07:10


          Merge branch 'main' into migrate-config-and-context-part-2

a7a7887


          move the packages back into internal

47418a3

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>


          changed to use hashicorp LRU cache implementation

7ded691

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>


          adding some comments and removing hardcoded values

8dbd467

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso and others added 2 commits

October 27, 2025 12:18


          refactored the worker a bit, added logs and more comments to clarify …

f78dd1e

…functionality

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>


          Merge branch 'main' into migrate-config-and-context-part-2

be9d725

fabianburth reviewed

View reviewed changes

kubernetes/controller/internal/plugins/plugin.go

kubernetes/controller/cmd/main.go Outdated

kubernetes/controller/cmd/main.go Outdated

kubernetes/controller/internal/resolution/workers.go

fabianburth reviewed

View reviewed changes

kubernetes/controller/internal/resolution/service.go Outdated

kubernetes/controller/internal/resolution/workers_test.go Outdated

kubernetes/controller/internal/resolution/workers_test.go Outdated

kubernetes/controller/internal/resolution/workers_test.go Outdated

kubernetes/controller/internal/resolution/workers_test.go Outdated

kubernetes/controller/internal/resolution/service_test.go Outdated

kubernetes/controller/internal/resolution/service_test.go Outdated

kubernetes/controller/internal/resolution/workers_test.go Outdated

kubernetes/controller/internal/resolution/workers_test.go Outdated

kubernetes/controller/internal/resolution/workers_test.go Outdated


          Merge branch 'main' into migrate-config-and-context-part-2

b7720e1

Skarlso commented Oct 28, 2025

Contributor Author

Okay, switch to synctest and it surfaced a problem. Singleflight was unable to ensure deduplication simply because if there was given time, it was called with the same key again and the other workers didn't clean up yet, the queue got the same work twice in it. We are going to remove singleflight and switch the inprogress tracking as it was before. Singleflight just didn't work in this setup.


          switched the tests to use synctest

e59f05e

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

jakobmoellerdev commented Oct 28, 2025

Member

this is fine. as long as you stick with one setup and it works youre good.


          refactor to use an InProgress check for deduplication

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 4c294b3 to a528fd3 Compare

October 28, 2025 17:03


          removed significant complexity from the workerpool

e2d38df

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from a528fd3 to e2d38df Compare

October 28, 2025 17:05


          add doc.go file describing the resolver package

36ef7bc

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso marked this pull request as ready for review

October 29, 2025 08:50

Skarlso requested a review from a team as a code owner

October 29, 2025 08:50


          Merge branch 'main' into migrate-config-and-context-part-2

04fc843

jakobmoellerdev reviewed

View reviewed changes

kubernetes/controller/internal/resolution/doc.go

jakobmoellerdev previously approved these changes

View reviewed changes

Skarlso dismissed jakobmoellerdev’s stale review via

4852a07

October 29, 2025 11:24

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 4852a07 to 98be16d Compare

October 29, 2025 11:27


          refactored the tests and removed all the additional plugins

06875b9

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso force-pushed the migrate-config-and-context-part-2 branch from 98be16d to 06875b9 Compare

October 29, 2025 11:28

jakobmoellerdev previously approved these changes

View reviewed changes


          remove unused atomic pointers

8c2f19b

On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com>

Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>

Skarlso dismissed jakobmoellerdev’s stale review via

8c2f19b

October 29, 2025 12:28

fabianburth approved these changes

View reviewed changes

jakobmoellerdev approved these changes

View reviewed changes

jakobmoellerdev merged commit 46a0571 into open-component-model:main

17 checks passed

jakobmoellerdev mentioned this pull request

Adjust resolution service to provide component version repository open-component-model/ocm-project#693

Closed

7 tasks

frewilhelm mentioned this pull request

Finish migration of Component Controller to V2 backed by resolution service open-component-model/ocm-project#753

Closed

13 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

kind/feature size/l