From df9b5df8d49e7231fac1b0c4fd240badc7f0663b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Sun, 9 Mar 2025 21:10:59 +0100 Subject: [PATCH 1/2] improve: remove sealess type change MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The curret implementation changed the underlying type, what is not we expect when passing an instance will create issues when some compares GVKs that are first passed then read. On the other hand if the user passes an instance of GVKP just can casr back. Signed-off-by: Attila Mészáros --- .../kubernetes/GenericKubernetesDependentResource.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesDependentResource.java index f1dbb97cb4..0fbf48b14d 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesDependentResource.java @@ -9,7 +9,7 @@ public class GenericKubernetesDependentResource

extends KubernetesDependentResource { - private final GroupVersionKindPlural groupVersionKind; + private final GroupVersionKind groupVersionKind; public GenericKubernetesDependentResource(GroupVersionKind groupVersionKind) { this(GroupVersionKindPlural.from(groupVersionKind)); @@ -27,7 +27,7 @@ public GenericKubernetesDependentResource(GroupVersionKindPlural groupVersionKin } @SuppressWarnings("unused") - public GroupVersionKindPlural getGroupVersionKind() { + public GroupVersionKind getGroupVersionKind() { return groupVersionKind; } } From f584d03181ca412ae82efc4b7783bf262a2258cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Attila=20M=C3=A9sz=C3=A1ros?= Date: Sun, 9 Mar 2025 21:13:25 +0100 Subject: [PATCH 2/2] fix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Attila Mészáros --- .../dependent/kubernetes/GenericKubernetesDependentResource.java | 1 + 1 file changed, 1 insertion(+) diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesDependentResource.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesDependentResource.java index 0fbf48b14d..34b17cefb9 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesDependentResource.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/GenericKubernetesDependentResource.java @@ -20,6 +20,7 @@ public GenericKubernetesDependentResource(GroupVersionKindPlural groupVersionKin this.groupVersionKind = groupVersionKind; } + @Override protected InformerEventSourceConfiguration.Builder informerConfigurationBuilder(EventSourceContext

context) { return InformerEventSourceConfiguration.from(