improve: owner reference mappers checks only group not apiVersion by csviri · Pull Request #3302 · operator-framework/java-operator-sdk · GitHub

In case of a resource is has a new version, but owner reference
still points to the old version we should still propapage the event.

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

cc @shawkins

Pull request overview

This PR updates owner-reference-based secondary-to-primary mapping so events still propagate when the owner reference points to an older version of the same API group (e.g., apps/v1beta1 vs apps/v1), by matching on group instead of full apiVersion.

Changes:

Update Mappers.fromOwnerReferences(...) to match owner references by kind + API group (ignoring version).
Add ReconcilerUtilsInternal.getGroup(String apiVersion) helper to extract the API group from an apiVersion string.
Add a unit test validating group extraction behavior.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.

File	Description
operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/Mappers.java	Relaxes owner-reference matching from exact apiVersion to API group comparison.
operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ReconcilerUtilsInternal.java	Introduces getGroup helper for parsing API group from apiVersion.
operator-framework-core/src/test/java/io/javaoperatorsdk/operator/ReconcilerUtilsInternalTest.java	Adds coverage for getGroup parsing behavior.

This change intentionally relaxes ownerReference matching from full apiVersion to just group. Please add a focused unit test in the existing MappersTest that demonstrates the new behavior (same group + kind but different versions should still map), so future refactors don’t accidentally revert to strict apiVersion matching.

see also: keycloak/keycloak#48030 (comment)

In case of a resource is has a new version, but owner reference still points to the old version we should still propapage the event. Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

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

I'm not sure this is the correct behavior: shouldn't there be a conversion hook instead? It seems dangerous to potentially match resources with differing versions…

Conversion hooks, does not update the owner references of the resource. Maybe we should have an integration test also this, to see how exactly and what happens. I will add one.

Maybe would be more pc to target next with this PR.

I don't have anything else to add to what was already mentioned.

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

@xstefank @metacosm I added also an E2E test, it seems that even if the CR is updated to new apiVersion the owner ref stays the same. So the implementation is correct this way.

Signed-off-by: Chris Laprun <metacosm@gmail.com>

Thank you everyone.

Copilot AI review requested due to automatic review settings April 20, 2026 10:25

openshift-ci Bot requested review from metacosm and xstefank April 20, 2026 10:25

Copilot started reviewing on behalf of csviri April 20, 2026 10:25 View session

csviri mentioned this pull request Apr 20, 2026

Update to operator version 26.6.0 needs deletion of all objects keycloak/keycloak#48030

Closed

2 tasks

Copilot AI reviewed Apr 20, 2026

View reviewed changes

csviri added 2 commits April 20, 2026 12:46

improve: owner reference mappers checks only group not apiVersion

d36c058

In case of a resource is has a new version, but owner reference still points to the old version we should still propapage the event. Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

wip

e57272d

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

csviri force-pushed the owner-ref-mapper branch from 0345443 to e57272d Compare April 20, 2026 10:46

csviri requested a review from shawkins April 20, 2026 10:46

metacosm reviewed Apr 20, 2026

View reviewed changes

Comment thread operator-framework-core/src/main/java/io/javaoperatorsdk/operator/ReconcilerUtilsInternal.java

csviri commented Apr 20, 2026

View reviewed changes

Comment thread ...core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/Mappers.java

vmuzikar mentioned this pull request Apr 20, 2026

fix: ensures that owner references are updated after an upgrade keycloak/keycloak#48213

Merged

shawkins mentioned this pull request Apr 20, 2026

Remove operator version tolerant workaround keycloak/keycloak#48282

Open

xstefank approved these changes Apr 21, 2026

View reviewed changes

integration test skeleton

a002783

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

csviri marked this pull request as draft April 21, 2026 14:29

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 Apr 21, 2026

csviri changed the title improve: owner reference mappers checks only group not apiVersion [WIP] improve: owner reference mappers checks only group not apiVersion Apr 21, 2026

remove special case handling with slash prefix

b3e6465

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

csviri marked this pull request as ready for review April 22, 2026 08:03

openshift-ci Bot requested review from metacosm and xstefank April 22, 2026 08:03

csviri changed the title [WIP] improve: owner reference mappers checks only group not apiVersion improve: owner reference mappers checks only group not apiVersion Apr 22, 2026

openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 22, 2026

refactor: use constants

fa85fe0

Signed-off-by: Chris Laprun <metacosm@gmail.com>

metacosm approved these changes Apr 22, 2026

View reviewed changes

csviri merged commit 94f005e into operator-framework:main Apr 22, 2026
30 of 32 checks passed

csviri deleted the owner-ref-mapper branch April 24, 2026 10:36

                 public static <T extends HasMetadata> SecondaryToPrimaryMapper<T> fromOwnerReferences(
                     String apiVersion, String kind, boolean clusterScope) {
-                  String correctApiVersion = apiVersion.startsWith("/") ? apiVersion.substring(1) : apiVersion;
                   return resource ->
                       resource.getMetadata().getOwnerReferences().stream()
-                          .filter(r -> r.getKind().equals(kind) && r.getApiVersion().equals(correctApiVersion))
+                          .filter(
+                              r ->
+                                  r.getKind().equals(kind)
+                                      && getGroup(r.getApiVersion()).equals(getGroup(apiVersion)))
                           .map(or -> ResourceID.fromOwnerReference(resource, or, clusterScope))
                           .collect(Collectors.toSet());

+                          .filter(
+                              r ->
+                                  r.getKind().equals(kind)
+                                      && getGroup(r.getApiVersion()).equals(getGroup(apiVersion)))

improve: owner reference mappers checks only group not apiVersion by csviri · Pull Request #3302 · operator-framework/java-operator-sdk · GitHub

Uh oh!

improve: owner reference mappers checks only group not apiVersion - #3302

improve: owner reference mappers checks only group not apiVersion#3302
csviri merged 5 commits into
operator-framework:mainfrom
csviri:owner-ref-mapper

csviri commented Apr 20, 2026

Uh oh!

csviri commented Apr 20, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Copilot AI Apr 20, 2026

Uh oh!

csviri commented Apr 20, 2026

Uh oh!

Uh oh!

Uh oh!

metacosm Apr 20, 2026

Uh oh!

csviri Apr 20, 2026

Uh oh!

Uh oh!

Uh oh!

csviri commented Apr 20, 2026

Uh oh!

xstefank left a comment

Uh oh!

csviri commented Apr 22, 2026

Uh oh!

Uh oh!

shawkins commented Apr 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

improve: owner reference mappers checks only group not apiVersion by csviri · Pull Request #3302 · operator-framework/java-operator-sdk · GitHub

Uh oh!

improve: owner reference mappers checks only group not apiVersion - #3302

improve: owner reference mappers checks only group not apiVersion#3302csviri merged 5 commits intooperator-framework:mainoperator-framework/java-operator-sdk:mainfrom csviri:owner-ref-mappercsviri/java-operator-sdk:owner-ref-mapperCopy head branch name to clipboard

Conversation

csviri commented Apr 20, 2026

Uh oh!

csviri commented Apr 20, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Copilot AI Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

csviri commented Apr 20, 2026

Uh oh!

Uh oh!

Uh oh!

metacosm Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

csviri Apr 20, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

csviri commented Apr 20, 2026

Uh oh!

xstefank left a comment

Choose a reason for hiding this comment

Uh oh!

csviri commented Apr 22, 2026

Uh oh!

Uh oh!

shawkins commented Apr 22, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

improve: owner reference mappers checks only group not apiVersion#3302
csviri merged 5 commits into
operator-framework:mainfrom
csviri:owner-ref-mapper