Skip to content

Commit 3586c2d

Browse files
committed
wip
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 3f22f3e commit 3586c2d

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,11 +188,12 @@ public synchronized void putResource(T newResource) {
188188
return;
189189
}
190190

191+
var ns = newResource.getMetadata().getNamespace();
191192
// todo unit test
192193
// this can happen when we dynamically change the NS
193-
if (!managedInformerEventSource
194-
.manager()
195-
.isWatchingNamespace(newResource.getMetadata().getNamespace())) {
194+
if (!managedInformerEventSource.manager().isWatchingNamespace(ns)) {
195+
log.debug(
196+
"Skipping caching of resource: {} since namespace is now watched: {}", resourceId, ns);
196197
return;
197198
}
198199

@@ -201,7 +202,7 @@ public synchronized void putResource(T newResource) {
201202
//
202203
// this also prevents resurrecting recently deleted entities for which the delete event
203204
// has already been processed
204-
var latestRV = getLastSyncResourceVersion(newResource.getMetadata().getNamespace());
205+
var latestRV = getLastSyncResourceVersion(ns);
205206
if (latestRV != null
206207
&& ReconcilerUtilsInternal.compareResourceVersions(
207208
latestRV, newResource.getMetadata().getResourceVersion())

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/source/informer/TemporaryPrimaryResourceCacheTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ void setup() {
5858
managedInformerEventSource = mock(ManagedInformerEventSource.class);
5959
var mim = mock(InformerManager.class);
6060
when(managedInformerEventSource.manager()).thenReturn(mim);
61+
when(mim.isWatchingNamespace(any())).thenReturn(true);
6162
when(mim.lastSyncResourceVersion(any())).then(a -> latestSyncVersion);
6263
temporaryResourceCache =
6364
new TemporaryResourceCache<>(

operator-framework/src/test/java/io/javaoperatorsdk/operator/dependent/dependentdifferentnamespace/ConfigMapDependentResource.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919

2020
import io.fabric8.kubernetes.api.model.ConfigMap;
2121
import io.fabric8.kubernetes.api.model.ObjectMeta;
22+
import io.javaoperatorsdk.operator.api.config.informer.Informer;
23+
import io.javaoperatorsdk.operator.api.reconciler.Constants;
2224
import io.javaoperatorsdk.operator.api.reconciler.Context;
2325
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.CRUDNoGCKubernetesDependentResource;
26+
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.KubernetesDependent;
2427

28+
@KubernetesDependent(informer = @Informer(namespaces = Constants.WATCH_ALL_NAMESPACES))
2529
public class ConfigMapDependentResource
2630
extends CRUDNoGCKubernetesDependentResource<
2731
ConfigMap, DependentDifferentNamespaceCustomResource> {

0 commit comments

Comments
 (0)