diff --git a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/UpdateControl.java b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/UpdateControl.java index 12f392901d..7eb7d2ae84 100644 --- a/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/UpdateControl.java +++ b/operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/UpdateControl.java @@ -8,17 +8,17 @@ public class UpdateControl
extends BaseControl handleDispatch(ExecutionScope executionScope)
Context context =
new DefaultContext<>(executionScope.getRetryInfo(), controller, originalResource);
if (markedForDeletion) {
- return handleCleanup(originalResource, resourceForExecution, context);
+ return handleCleanup(resourceForExecution, context);
} else {
return handleReconcile(executionScope, resourceForExecution, originalResource, context);
}
@@ -147,23 +147,24 @@ private PostExecutionControl reconcileExecution(ExecutionScope executionSc
.setResourceVersion(updatedCustomResource.getMetadata().getResourceVersion());
updatedCustomResource =
updateStatusGenerationAware(updateControl.getResource(), originalResource,
- updateControl.isPatch());
+ updateControl.isPatchStatus());
} else if (updateControl.isUpdateStatus()) {
updatedCustomResource =
updateStatusGenerationAware(updateControl.getResource(), originalResource,
- updateControl.isPatch());
+ updateControl.isPatchStatus());
} else if (updateControl.isUpdateResource()) {
updatedCustomResource =
updateCustomResource(updateControl.getResource());
if (shouldUpdateObservedGenerationAutomatically(updatedCustomResource)) {
updatedCustomResource =
updateStatusGenerationAware(updateControl.getResource(), originalResource,
- updateControl.isPatch());
+ updateControl.isPatchStatus());
}
} else if (updateControl.isNoUpdate()
&& shouldUpdateObservedGenerationAutomatically(resourceForExecution)) {
updatedCustomResource =
- updateStatusGenerationAware(originalResource, originalResource, updateControl.isPatch());
+ updateStatusGenerationAware(originalResource, originalResource,
+ updateControl.isPatchStatus());
}
return createPostExecutionControl(updatedCustomResource, updateControl);
}
@@ -259,7 +260,7 @@ private PostExecutionControl createPostExecutionControl(P updatedCustomResour
UpdateControl updateControl) {
PostExecutionControl postExecutionControl;
if (updatedCustomResource != null) {
- if (updateControl.isUpdateStatus() && updateControl.isPatch()) {
+ if (updateControl.isUpdateStatus() && updateControl.isPatchStatus()) {
postExecutionControl =
PostExecutionControl.customResourceStatusPatched(updatedCustomResource);
} else {
@@ -279,7 +280,7 @@ private void updatePostExecutionControlWithReschedule(
}
- private PostExecutionControl handleCleanup(P originalResource, P resource,
+ private PostExecutionControl handleCleanup(P resource,
Context context) {
log.debug(
"Executing delete for resource: {} with version: {}",
@@ -317,8 +318,10 @@ private P updateCustomResourceWithFinalizer(P resourceForExecution, P originalRe
}
private P updateCustomResource(P resource) {
- log.debug("Updating resource: {} with version: {}", getUID(resource), getVersion(resource));
+ log.debug("Updating resource: {} with version: {}", getUID(resource),
+ getVersion(resource));
log.trace("Resource before update: {}", resource);
+
return customResourceFacade.updateResource(resource);
}