Skip to content

Commit 38e7265

Browse files
committed
wip
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 1f98b60 commit 38e7265

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

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

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import io.fabric8.kubernetes.client.dsl.MixedOperation;
3333
import io.fabric8.kubernetes.client.informers.ResourceEventHandler;
3434
import io.javaoperatorsdk.operator.OperatorException;
35-
import io.javaoperatorsdk.operator.ReconcilerUtilsInternal;
3635
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
3736
import io.javaoperatorsdk.operator.api.config.Informable;
3837
import io.javaoperatorsdk.operator.api.config.NamespaceChangeable;
@@ -193,15 +192,11 @@ public Optional<R> get(ResourceID resourceID) {
193192
// point the resource would already be present in the informer cache, but we would
194193
// have missed it in both caches during this call.
195194
Optional<R> resource = temporaryResourceCache.getResourceFromCache(resourceID);
196-
var res = cache.get(resourceID);
197-
if (comparableResourceVersions
198-
&& resource.isPresent()
199-
&& res.filter(
200-
r -> ReconcilerUtilsInternal.compareResourceVersions(r, resource.orElseThrow()) > 0)
201-
.isEmpty()) {
195+
if (comparableResourceVersions && resource.isPresent()) {
202196
log.debug("Latest resource found in temporary cache for Resource ID: {}", resourceID);
203197
return resource;
204198
}
199+
var res = cache.get(resourceID);
205200
log.debug(
206201
"Resource not found, or older, in temporary cache. Found in informer cache {}, for"
207202
+ " Resource ID: {}",

0 commit comments

Comments
 (0)