feat: provide de-duplicated secondary resources stream on Context #3141
Conversation
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
openshift-ci
bot
added
the
do-not-merge/work-in-progress
openshift-merge-robot
added
the
needs-rebase
metacosm
requested review from
csviri and
xstefank
and removed request for
xstefank
openshift-merge-robot
removed
the
needs-rebase
xstefank
approved these changes
Jan 30, 2026
...-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java
Show resolved
Hide resolved
...-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java
Outdated
Show resolved
Hide resolved
...mework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceOperations.java
Outdated
Show resolved
Hide resolved
csviri
requested changes
Jan 30, 2026
Collaborator
csviri
left a comment
csviri
left a comment
There was a problem hiding this comment.
Made some minor comments, pls add unit tests! Otherwise looks great, thank you!!
|
|
||
| default <R> Stream<R> getSecondaryResourcesAsStream(Class<R> expectedType) { | ||
| return getSecondaryResources(expectedType).stream(); | ||
| return getSecondaryResourcesAsStream(expectedType, false); |
Collaborator
There was a problem hiding this comment.
Here we could use the former implementation and call this in case in the new method the deduplication is false.
...-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java
Show resolved
Hide resolved
...-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java
Show resolved
Hide resolved
metacosm
force-pushed
the
latest-distinct-alternative
branch
from
fdfaa63 to
3c9de5c
Compare
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
metacosm
commented
Feb 2, 2026
| } | ||
| return stream | ||
| .collect( | ||
| Collectors.toUnmodifiableMap( |
Collaborator
Author
There was a problem hiding this comment.
In the end, I couldn't make the implementation work without collecting to Map, I iterated over the code and ended collecting manually…
metacosm
force-pushed
the
latest-distinct-alternative
branch
3 times, most recently
from
28328fb to
afa2dc8
Compare
Signed-off-by: Chris Laprun <[email protected]>
metacosm
force-pushed
the
latest-distinct-alternative
branch
from
afa2dc8 to
7158917
Compare
csviri
approved these changes
Feb 3, 2026
Collaborator
csviri
left a comment
csviri
left a comment
There was a problem hiding this comment.
Added some nits, pls make the CI happy, otherwise LGTM!
|
|
||
| /** | ||
| * Whether this ResourceID points to the same resource as the one identified by the specified name | ||
| * and namespace. Note that this doesn't take API version or Kind into account so this should only |
Collaborator
There was a problem hiding this comment.
nit: does not take Group either.
Collaborator
Author
There was a problem hiding this comment.
Yeah, didn't want to get into all the details 😅
Actually planning on adding this to HasMetadata in the client.
| var updatedResource = | ||
| extension.get(LatestDistinctTestResource.class, TEST_RESOURCE_NAME); | ||
| assertThat(updatedResource.getStatus()).isNotNull(); | ||
| // Should see 3 distinct ConfigMaps |
Collaborator
There was a problem hiding this comment.
This comment needs ro be adjusted
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Alternative to #3130, to discuss