Skip to content

Commit 20173a5

Browse files
committed
format
Signed-off-by: Attila Mészáros <csviri@gmail.com>
1 parent 180c174 commit 20173a5

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,10 +151,11 @@ private PostExecutionControl<P> reconcileExecution(ExecutionScope<P> executionSc
151151
}
152152

153153
// check if status also needs to be updated
154-
final var updateObservedGeneration = updateControl.isNoUpdate() ?
155-
shouldUpdateObservedGenerationAutomatically(resourceForExecution) :
156-
shouldUpdateObservedGenerationAutomatically(updatedCustomResource);
157-
if (updateControl.isUpdateResourceAndStatus() || updateControl.isUpdateStatus() || updateObservedGeneration) {
154+
final var updateObservedGeneration = updateControl.isNoUpdate()
155+
? shouldUpdateObservedGenerationAutomatically(resourceForExecution)
156+
: shouldUpdateObservedGenerationAutomatically(updatedCustomResource);
157+
if (updateControl.isUpdateResourceAndStatus() || updateControl.isUpdateStatus()
158+
|| updateObservedGeneration) {
158159
updatedCustomResource =
159160
updateStatusGenerationAware(toUpdate, originalResource, updateControl.isPatchStatus());
160161
}

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/statuspatchnonlocking/StatusPatchLockingCustomResource.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
import io.fabric8.kubernetes.api.model.Namespaced;
44
import io.fabric8.kubernetes.client.CustomResource;
55
import io.fabric8.kubernetes.model.annotation.Group;
6-
import io.fabric8.kubernetes.model.annotation.Kind;
76
import io.fabric8.kubernetes.model.annotation.ShortNames;
87
import io.fabric8.kubernetes.model.annotation.Version;
98

109
@Group("sample.javaoperatorsdk")
1110
@Version("v1")
12-
@Kind("StatusUpdateLockingCustomResource")
1311
@ShortNames("sul")
1412
public class StatusPatchLockingCustomResource
1513
extends

0 commit comments

Comments
 (0)