Skip to content

Commit 26dcd1b

Browse files
committed
fixes
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent f5906cf commit 26dcd1b

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultResourceConfiguration.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ protected DefaultResourceConfiguration(Class<R> resourceClass,
3131
ItemStore<R> itemStore, Long informerListLimit) {
3232
this.resourceClass = resourceClass;
3333
this.resourceTypeName = resourceClass.isAssignableFrom(GenericKubernetesResource.class)
34-
// todo better handling?
34+
// in general this is irrelevant now for secondary resources it is used just by controller
35+
// where GenericKubernetesResource now does not apply
3536
? GENERIC_KUBERNETES_RESOURCE
3637
: ReconcilerUtils.getResourceTypeName(resourceClass);
3738
this.onAddFilter = onAddFilter;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ private void configureWith(String labelSelector, Set<String> namespaces,
7676
configureWith(new InformerEventSource<>(ic, context));
7777
}
7878

79+
// just to seamlessly handle GenericKubernetesDependentResource
7980
protected InformerConfiguration.InformerConfigurationBuilder<R> informerConfigurationBuilder() {
8081
return InformerConfiguration.from(resourceType());
8182
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerWrapper.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,8 @@ public void start() throws OperatorException {
114114

115115
private String versionedFullResourceName() {
116116
final var apiTypeClass = informer.getApiTypeClass();
117-
// todo better messages handling
118117
if (apiTypeClass.isAssignableFrom(GenericKubernetesResource.class)) {
119-
return "GenericKubernetesResource";
118+
return GenericKubernetesResource.class.getSimpleName();
120119
}
121120
return ReconcilerUtils.getResourceTypeNameWithVersion(apiTypeClass);
122121
}

0 commit comments

Comments
 (0)