Skip to content

Commit 2c65a0f

Browse files
committed
IT
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent 8ba3ee4 commit 2c65a0f

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/UpdatingResAndSubResIT.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
class UpdatingResAndSubResIT {
2020
@RegisterExtension
2121
LocallyRunOperatorExtension operator =
22-
LocallyRunOperatorExtension.builder().withReconciler(DoubleUpdateTestCustomReconciler.class)
22+
23+
LocallyRunOperatorExtension.builder()
24+
.withConfigurationService(o -> o.withUseSSAToPatchPrimaryResource(false))
25+
.withReconciler(DoubleUpdateTestCustomReconciler.class)
2326
.build();
2427

2528
@Test

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/doubleupdate/DoubleUpdateTestCustomReconciler.java

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import org.slf4j.Logger;
77
import org.slf4j.LoggerFactory;
88

9-
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
109
import io.javaoperatorsdk.operator.api.reconciler.Context;
1110
import io.javaoperatorsdk.operator.api.reconciler.ControllerConfiguration;
1211
import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@@ -29,18 +28,13 @@ public UpdateControl<DoubleUpdateTestCustomResource> reconcile(
2928
numberOfExecutions.addAndGet(1);
3029

3130
log.info("Value: " + resource.getSpec().getValue());
32-
DoubleUpdateTestCustomResource res = new DoubleUpdateTestCustomResource();
33-
res.setMetadata(new ObjectMetaBuilder()
34-
.withName(resource.getMetadata().getName())
35-
.withNamespace(resource.getMetadata().getNamespace())
36-
.build());
37-
38-
res.getMetadata().setAnnotations(new HashMap<>());
39-
res.getMetadata().getAnnotations().put(TEST_ANNOTATION, TEST_ANNOTATION_VALUE);
40-
ensureStatusExists(res);
41-
res.getStatus().setState(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
42-
43-
return UpdateControl.patchResourceAndStatus(res);
31+
32+
resource.getMetadata().setAnnotations(new HashMap<>());
33+
resource.getMetadata().getAnnotations().put(TEST_ANNOTATION, TEST_ANNOTATION_VALUE);
34+
ensureStatusExists(resource);
35+
resource.getStatus().setState(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
36+
37+
return UpdateControl.patchResourceAndStatus(resource);
4438
}
4539

4640
private void ensureStatusExists(DoubleUpdateTestCustomResource resource) {

0 commit comments

Comments
 (0)