Skip to content

Commit 33a2f3f

Browse files
committed
wip
Signed-off-by: Attila Mészáros <a_meszaros@apple.com>
1 parent 834ae6a commit 33a2f3f

File tree

1 file changed

+14
-3
lines changed

1 file changed

+14
-3
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/cachingfilteringupdate/CachingFilteringUpdateReconciler.java

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,27 +43,38 @@ public UpdateControl<CachingFilteringUpdateCustomResource> reconcile(
4343
CachingFilteringUpdateCustomResource resource,
4444
Context<CachingFilteringUpdateCustomResource> context) {
4545

46-
context.resourceOperations().serverSideApply(prepareCM(resource));
46+
context.resourceOperations().serverSideApply(prepareCM(resource, 1));
4747
var cachedCM = context.getSecondaryResource(ConfigMap.class);
4848
if (cachedCM.isEmpty()) {
4949
issueFound.set(true);
5050
throw new IllegalStateException("Error for resource: " + ResourceID.fromResource(resource));
5151
}
5252

53+
var updated = context.resourceOperations().serverSideApply(prepareCM(resource, 2));
54+
cachedCM = context.getSecondaryResource(ConfigMap.class);
55+
if (!cachedCM
56+
.orElseThrow()
57+
.getMetadata()
58+
.getResourceVersion()
59+
.equals(updated.getMetadata().getResourceVersion())) {
60+
issueFound.set(true);
61+
throw new IllegalStateException("Error for resource: " + ResourceID.fromResource(resource));
62+
}
63+
5364
ensureStatusExists(resource);
5465
resource.getStatus().setUpdated(true);
5566
return UpdateControl.patchStatus(resource);
5667
}
5768

58-
private static ConfigMap prepareCM(CachingFilteringUpdateCustomResource p) {
69+
private static ConfigMap prepareCM(CachingFilteringUpdateCustomResource p, int num) {
5970
var cm =
6071
new ConfigMapBuilder()
6172
.withMetadata(
6273
new ObjectMetaBuilder()
6374
.withName(p.getMetadata().getName())
6475
.withNamespace(p.getMetadata().getNamespace())
6576
.build())
66-
.withData(Map.of("name", p.getMetadata().getName()))
77+
.withData(Map.of("name", p.getMetadata().getName(), "num", "" + num))
6778
.build();
6879
cm.addOwnerReference(p);
6980
return cm;

0 commit comments

Comments
 (0)