From 35b94c03f41c460812790a746ae9d0dfd8fd6af7 Mon Sep 17 00:00:00 2001 From: shawkins Date: Mon, 27 Sep 2021 12:37:53 -0400 Subject: [PATCH] disabling the managedkafka finalizer --- .../bf2/operator/controllers/ManagedKafkaAgentController.java | 2 +- .../org/bf2/operator/controllers/ManagedKafkaController.java | 2 +- .../src/test/java/org/bf2/systemtest/integration/SmokeST.java | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaAgentController.java b/operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaAgentController.java index 996c7b590..3e9731ec3 100644 --- a/operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaAgentController.java +++ b/operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaAgentController.java @@ -43,7 +43,7 @@ * An alternative to this approach would be to have the ManagedKafkaControl make status * updates directly based upon the changes it sees in the ManagedKafka instances. */ -@Controller +@Controller(finalizerName = Controller.NO_FINALIZER) public class ManagedKafkaAgentController implements ResourceController { @Inject diff --git a/operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaController.java b/operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaController.java index c709e696a..1d6a932a4 100644 --- a/operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaController.java +++ b/operator/src/main/java/org/bf2/operator/controllers/ManagedKafkaController.java @@ -34,7 +34,7 @@ import java.util.Objects; import java.util.Optional; -@Controller +@Controller(finalizerName = Controller.NO_FINALIZER) public class ManagedKafkaController implements ResourceController { @Inject diff --git a/systemtest/src/test/java/org/bf2/systemtest/integration/SmokeST.java b/systemtest/src/test/java/org/bf2/systemtest/integration/SmokeST.java index 30c12cef2..f500ab249 100644 --- a/systemtest/src/test/java/org/bf2/systemtest/integration/SmokeST.java +++ b/systemtest/src/test/java/org/bf2/systemtest/integration/SmokeST.java @@ -30,6 +30,7 @@ import java.util.concurrent.CompletableFuture; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; @Tag(TestTags.SMOKE) public class SmokeST extends AbstractST { @@ -99,6 +100,8 @@ void testCreateManagedKafka(ExtensionContext extensionContext) throws Exception .readValue(SyncApiClient.getManagedKafkaStatus(mk.getId(), syncEndpoint).body(), ManagedKafkaStatus.class); ManagedKafka managedKafka = ManagedKafkaResourceType.getOperation().inNamespace(mkAppName).withName(mkAppName).get(); + assertTrue(managedKafka.getMetadata().getFinalizers() == null || managedKafka.getMetadata().getFinalizers().isEmpty()); + AssertUtils.assertManagedKafkaStatus(managedKafka, apiStatus); //Get agent status