Skip to content

Revert "chore: temporarily revert SSA for finalizers (#1654)" #1655

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 12, 2022
Merged

Revert "chore: temporarily revert SSA for finalizers (#1654)" #1655

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 5 additions & 42 deletions .../src/main/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,8 @@ private PostExecutionControl<P> handleCleanup(P originalResource, P resource,
// cleanup is finished, nothing left to done
final var finalizerName = configuration().getFinalizerName();
if (deleteControl.isRemoveFinalizer() && resource.hasFinalizer(finalizerName)) {
P customResource = removeFinalizer(resource, finalizerName);
// todo: restore SSA
// P customResource = conflictRetryingPatch(resource, originalResource,
// r -> r.removeFinalizer(finalizerName));
P customResource = conflictRetryingPatch(resource, originalResource,
r -> r.removeFinalizer(finalizerName));
return PostExecutionControl.customResourceFinalizerRemoved(customResource);
}
}
Expand All @@ -313,49 +311,13 @@ private PostExecutionControl<P> handleCleanup(P originalResource, P resource,
return postExecutionControl;
}

// todo: remove after restoring SSA
public P removeFinalizer(P resource, String finalizer) {
if (log.isDebugEnabled()) {
log.debug("Removing finalizer on resource: {}", ResourceID.fromResource(resource));
}
int retryIndex = 0;
while (true) {
try {
var removed = resource.removeFinalizer(finalizer);
if (!removed) {
return resource;
}
return customResourceFacade.updateResource(resource);
} catch (KubernetesClientException e) {
log.trace("Exception during finalizer removal for resource: {}", resource);
retryIndex++;
// only retry on conflict (HTTP 409), otherwise fail
if (e.getCode() != 409) {
throw e;
}
if (retryIndex >= MAX_FINALIZER_REMOVAL_RETRY) {
throw new OperatorException(
"Exceeded maximum (" + MAX_FINALIZER_REMOVAL_RETRY
+ ") retry attempts to remove finalizer '" + finalizer + "' for resource "
+ ResourceID.fromResource(resource));
}
resource = customResourceFacade.getResource(resource.getMetadata().getNamespace(),
resource.getMetadata().getName());
}
}
}

private P updateCustomResourceWithFinalizer(P resourceForExecution, P originalResource) {
log.debug(
"Adding finalizer for resource: {} version: {}", getUID(originalResource),
getVersion(originalResource));

originalResource.addFinalizer(configuration().getFinalizerName());
return customResourceFacade.updateResource(originalResource);

// todo: restore SSA
// return conflictRetryingPatch(resourceForExecution, originalResource,
// r -> r.addFinalizer(configuration().getFinalizerName()));
return conflictRetryingPatch(resourceForExecution, originalResource,
r -> r.addFinalizer(configuration().getFinalizerName()));
}

private P updateCustomResource(P resource) {
Expand Down Expand Up @@ -434,6 +396,7 @@ public R updateResource(R resource) {
.replace();
}

@SuppressWarnings({"rawtypes", "unchecked"})
public R updateStatus(R resource) {
log.trace("Updating status for resource: {}", resource);
return resource(resource)
Expand Down
7 changes: 1 addition & 6 deletions .../test/java/io/javaoperatorsdk/operator/processing/event/ReconciliationDispatcherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.mockito.ArgumentCaptor;
import org.mockito.ArgumentMatcher;
Expand All @@ -23,10 +22,7 @@
import io.javaoperatorsdk.operator.MockKubernetesClient;
import io.javaoperatorsdk.operator.OperatorException;
import io.javaoperatorsdk.operator.TestUtils;
import io.javaoperatorsdk.operator.api.config.Cloner;
import io.javaoperatorsdk.operator.api.config.ConfigurationServiceProvider;
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
import io.javaoperatorsdk.operator.api.config.MockControllerConfiguration;
import io.javaoperatorsdk.operator.api.config.*;
import io.javaoperatorsdk.operator.api.reconciler.Cleaner;
import io.javaoperatorsdk.operator.api.reconciler.Context;
import io.javaoperatorsdk.operator.api.reconciler.DeleteControl;
Expand Down Expand Up @@ -59,7 +55,6 @@
import static org.mockito.Mockito.when;

@SuppressWarnings({"unchecked", "rawtypes"})
@Disabled(value = "todo: reactivate when restoring SSA")
class ReconciliationDispatcherTest {

private static final String DEFAULT_FINALIZER = "javaoperatorsdk.io/finalizer";
Expand Down
2 changes: 0 additions & 2 deletions operator-framework/src/test/java/io/javaoperatorsdk/operator/CachePruneIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import java.time.Duration;
import java.util.Map;

import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

Expand All @@ -18,7 +17,6 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.awaitility.Awaitility.await;

@Disabled(value = "todo: reactivate when restoring SSA")
class CachePruneIT {

public static final String DEFAULT_DATA = "default_data";
Expand Down