Skip to content

Commit cd67480

Browse files
committed
wip
1 parent 0d98cd7 commit cd67480

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -377,7 +377,6 @@ static class CustomResourceFacade<R extends HasMetadata> {
377377

378378
private final MixedOperation<R, KubernetesResourceList<R>, Resource<R>> resourceOperation;
379379
private final boolean useSSA;
380-
private final String fieldManager;
381380
private final Cloner cloner;
382381

383382
public CustomResourceFacade(
@@ -386,7 +385,6 @@ public CustomResourceFacade(
386385
Cloner cloner) {
387386
this.resourceOperation = resourceOperation;
388387
this.useSSA = configuration.getConfigurationService().useSSAToPatchPrimaryResource();
389-
this.fieldManager = configuration.fieldManager();
390388
this.cloner = cloner;
391389
}
392390

@@ -441,7 +439,7 @@ private R editStatus(Context<R> context, R resource, R originalResource) {
441439
resource.getMetadata().setResourceVersion(null);
442440
return ReconcileUtils.jsonPatchPrimaryStatus(
443441
context,
444-
originalResource,
442+
clonedOriginal,
445443
r -> {
446444
ReconcilerUtilsInternal.setStatus(r, ReconcilerUtilsInternal.getStatus(resource));
447445
return r;

operator-framework/src/test/java/io/javaoperatorsdk/operator/baseapi/patchresourceandstatusnossa/PatchResourceAndStatusNoSSAReconciler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public UpdateControl<PatchResourceAndStatusNoSSACustomResource> reconcile(
4545
Context<PatchResourceAndStatusNoSSACustomResource> context) {
4646
numberOfExecutions.addAndGet(1);
4747

48-
log.info("Value: " + resource.getSpec().getValue());
48+
log.info("Value: {}", resource.getSpec().getValue());
4949

5050
if (removeAnnotation) {
5151
resource.getMetadata().getAnnotations().remove(TEST_ANNOTATION);

0 commit comments

Comments
 (0)