Skip to content

feat(624): Implement apply sets from kro for deployer #624#1335

Merged
matthiasbruns merged 69 commits into
open-component-model:mainfrom
matthiasbruns:feat/624_apply_set_kro_deployer
Jan 29, 2026
Merged

feat(624): Implement apply sets from kro for deployer #624#1335
matthiasbruns merged 69 commits into
open-component-model:mainfrom
matthiasbruns:feat/624_apply_set_kro_deployer

Conversation

@matthiasbruns

@matthiasbruns matthiasbruns commented Dec 4, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

What this PR does / why we need it

We want to use the apply-sets from

to handle pruning without side-effects

Which issue(s) this PR fixes

Fixes: open-component-model/ocm-project#624

@github-actions github-actions Bot added kind/feature new feature, enhancement, improvement, extension size/s Small size/l Large labels Dec 4, 2025
@matthiasbruns matthiasbruns changed the title feat: add delete and remove concurrency check feat(624): Implement apply sets from kro for deployer #624 Dec 5, 2025
@matthiasbruns matthiasbruns force-pushed the feat/624_apply_set_kro_deployer branch 3 times, most recently from b87d119 to 978e1c7 Compare December 16, 2025 13:34
@github-actions github-actions Bot added the size/m Medium label Dec 16, 2025
@matthiasbruns matthiasbruns marked this pull request as ready for review December 16, 2025 13:35
@matthiasbruns matthiasbruns requested a review from a team as a code owner December 16, 2025 13:35
matthiasbruns
matthiasbruns commented Dec 16, 2025
View reviewed changes
Comment thread kubernetes/controller/internal/controller/deployer/applyset.go Outdated
matthiasbruns
matthiasbruns commented Dec 16, 2025
View reviewed changes
Comment thread kubernetes/controller/internal/controller/deployer/applyset.go Outdated
matthiasbruns
matthiasbruns commented Dec 16, 2025
View reviewed changes
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
matthiasbruns
matthiasbruns commented Dec 16, 2025
View reviewed changes
Comment thread kubernetes/controller/internal/controller/deployer/applyset.go Outdated
@matthiasbruns matthiasbruns force-pushed the feat/624_apply_set_kro_deployer branch 2 times, most recently from adf8593 to bc23fa8 Compare December 22, 2025 06:25
@github-actions github-actions Bot added the component/github-actions Changes on GitHub Actions or within `.github/` directory label Dec 30, 2025
matthiasbruns
matthiasbruns commented Dec 30, 2025
View reviewed changes
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
@matthiasbruns

matthiasbruns commented Jan 2, 2026

Copy link
Copy Markdown
Contributor Author
Screenshot 2026-01-02 at 16 59 33 deployer ApplySet labels

matthiasbruns
matthiasbruns commented Jan 6, 2026
View reviewed changes
Comment thread kubernetes/controller/internal/controller/applyset/applyset_flow_test.go Outdated
@matthiasbruns

matthiasbruns commented Jan 6, 2026

Copy link
Copy Markdown
Contributor Author

todo: clean up and rebase

matthiasbruns
matthiasbruns commented Jan 6, 2026
View reviewed changes
Comment thread kubernetes/controller/test/e2e/e2e_applyset_test.go Outdated
@matthiasbruns matthiasbruns force-pushed the feat/624_apply_set_kro_deployer branch 2 times, most recently from 890f1d5 to d10caba Compare January 6, 2026 14:10
Skarlso
Skarlso reviewed Jan 7, 2026
View reviewed changes
Comment thread kubernetes/controller/internal/controller/applyset/applyset.go Outdated
Skarlso
Skarlso reviewed Jan 7, 2026
View reviewed changes
Comment thread kubernetes/controller/internal/controller/applyset/applyset.go Outdated
jakobmoellerdev
jakobmoellerdev reviewed Jan 7, 2026
View reviewed changes
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
Comment thread kubernetes/controller/test/e2e/e2e_applyset_test.go Outdated
Comment thread kubernetes/controller/test/e2e/e2e_examples_test.go Outdated
Skarlso
Skarlso reviewed Jan 7, 2026
View reviewed changes
Comment thread kubernetes/controller/internal/controller/applyset/applyset.go Outdated
Skarlso
Skarlso reviewed Jan 7, 2026
View reviewed changes
Comment thread kubernetes/controller/internal/controller/applyset/applyset.go Outdated
piotrjanik
piotrjanik reviewed Jan 28, 2026
View reviewed changes
Comment thread kubernetes/controller/test/utils/utils.go Outdated
Comment thread kubernetes/controller/internal/controller/deployer/annotations.go Outdated
@matthiasbruns
feat: merge annotations and labels & cleanup
cdc5bb3 
On-behalf-of: SAP <matthias.bruns@sap.com>
Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
piotrjanik
piotrjanik previously approved these changes Jan 28, 2026
View reviewed changes
@matthiasbruns

matthiasbruns commented Jan 28, 2026

Copy link
Copy Markdown
Contributor Author

going to fix the tests tomorrow... main killed my pr 🥲

fabianburth
fabianburth reviewed Jan 28, 2026
View reviewed changes

@fabianburth fabianburth left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Mostly nits.

Comment thread kubernetes/controller/internal/controller/deployer/annotations.go
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
Comment thread kubernetes/controller/internal/controller/deployer/deployer_controller.go Outdated
@matthiasbruns

matthiasbruns commented Jan 29, 2026

Copy link
Copy Markdown
Contributor Author
Screenshot 2026-01-29 at 13 30 43 found it :D. was going crazy

@matthiasbruns
fix: wrong timeout setting
0613e07 
On-behalf-of: SAP <matthias.bruns@sap.com>
Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
Copilot AI review requested due to automatic review settings January 29, 2026 12:31

This comment was marked as off-topic.

Sign in to view

@matthiasbruns

matthiasbruns commented Jan 29, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

wtf copilot? - shouldn't happen again

@matthiasbruns matthiasbruns force-pushed the feat/624_apply_set_kro_deployer branch from 76c4b78 to c780773 Compare January 29, 2026 12:46
@matthiasbruns
chore: apply review comments
ee3be0d 
On-behalf-of: SAP <matthias.bruns@sap.com>
Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
@matthiasbruns matthiasbruns force-pushed the feat/624_apply_set_kro_deployer branch from c780773 to ee3be0d Compare January 29, 2026 13:29
matthiasbruns and others added 2 commits January 29, 2026 14:49
@matthiasbruns
Merge branch 'main' into feat/624_apply_set_kro_deployer
a761a6c
@matthiasbruns
fix: helm role
7484a50 
On-behalf-of: SAP <matthias.bruns@sap.com>
Signed-off-by: Matthias Bruns <git@matthiasbruns.com>
@matthiasbruns matthiasbruns merged commit b9f20b3 into open-component-model:main Jan 29, 2026
19 checks passed
@matthiasbruns matthiasbruns deleted the feat/624_apply_set_kro_deployer branch January 29, 2026 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Copilot left review comments

@piotrjanik piotrjanik piotrjanik approved these changes

@fabianburth fabianburth fabianburth approved these changes

@Skarlso Skarlso Awaiting requested review from Skarlso

@jakobmoellerdev jakobmoellerdev Awaiting requested review from jakobmoellerdev

Assignees

No one assigned

Labels

component/github-actions Changes on GitHub Actions or within `.github/` directory kind/feature new feature, enhancement, improvement, extension size/l Large size/m Medium size/s Small

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Implement apply sets from kro for deployer

7 participants

@matthiasbruns @frewilhelm @jakobmoellerdev @Skarlso @piotrjanik @fabianburth