fix: context being cancelled prematurely and adjusting flux api version for objects#1830
Merged
fabianburth merged 12 commits intoFeb 24, 2026
Merged
Conversation
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
Contributor
Author
|
Well, this didn't work. I'll look further. |
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
Contributor
Author
|
Looks like this is okay now. 🤞 |
Skarlso
commented
Feb 24, 2026
fabianburth
reviewed
Feb 24, 2026
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
…omponent-model into fix-flaky-controller-test
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
Contributor
Author
|
Oh, this time it's the e2e test. :D |
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
Contributor
Author
|
Damn it. This is passing locally 😭 |
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
1 task
Contributor
Author
|
Found it, I believe. :) |
On-behalf-of: Gergely Brautigam <gergely.brautigam@sap.com> Signed-off-by: Gergely Brautigam <182850+Skarlso@users.noreply.github.com>
frewilhelm
approved these changes
Feb 24, 2026
Contributor
|
PR to upgrade docs is also ready open-component-model/ocm-website#728 |
morri-son
pushed a commit
to open-component-model/ocm-website
that referenced
this pull request
Feb 24, 2026
Related to open-component-model/open-component-model#1830 (Flux promoted `source.toolkit.fluxcd.io/v1beta2` to `source.toolkit.fluxcd.io/v1`) Signed-off-by: Frederic Wilhelm <frederic.wilhelm@sap.com>
morri-son
approved these changes
Feb 24, 2026
ocmbot Bot
pushed a commit
to open-component-model/ocm-website
that referenced
this pull request
Feb 24, 2026
Related to open-component-model/open-component-model#1830 (Flux promoted `source.toolkit.fluxcd.io/v1beta2` to `source.toolkit.fluxcd.io/v1`) Signed-off-by: Frederic Wilhelm <frederic.wilhelm@sap.com> cc4b69a
fabianburth
approved these changes
Feb 24, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What this PR does / why we need it
There have been a couple test failures in unit tests now https://github.com/open-component-model/open-component-model/actions/runs/22314682631/job/64556121953.
It looks like the context is cancelled before things have the chance to shut down properly.
This prevents that from happening. I think this is a fix, but it might not be 100% true.
It's two phase problem. First, the environment was tearing down too fast. Second, set a graceful shutdown deadline for the manager so it doesn't just hang around for too long after receiving a shutdown.
Which issue(s) this PR fixes
Testing
How to test the changes
Verification
ocm