|
11 | 11 | import io.fabric8.kubernetes.api.model.ResourceRequirementsBuilder; |
12 | 12 | import io.skodjob.testframe.resources.KubeResourceManager; |
13 | 13 | import io.strimzi.api.kafka.model.kafka.KafkaResources; |
| 14 | +import io.strimzi.api.kafka.model.nodepool.KafkaNodePool; |
14 | 15 | import io.strimzi.systemtest.AbstractST; |
15 | 16 | import io.strimzi.systemtest.Environment; |
16 | 17 | import io.strimzi.systemtest.TestConstants; |
17 | 18 | import io.strimzi.systemtest.annotations.IsolatedTest; |
18 | 19 | import io.strimzi.systemtest.kafkaclients.internalClients.KafkaClients; |
19 | 20 | import io.strimzi.systemtest.labels.LabelSelectors; |
| 21 | +import io.strimzi.systemtest.resources.CrdClients; |
20 | 22 | import io.strimzi.systemtest.resources.crd.KafkaComponents; |
21 | 23 | import io.strimzi.systemtest.resources.operator.ClusterOperatorConfigurationBuilder; |
22 | 24 | import io.strimzi.systemtest.resources.operator.SetupClusterOperator; |
|
33 | 35 | import io.strimzi.systemtest.utils.kubeUtils.objects.ServiceUtils; |
34 | 36 | import org.apache.logging.log4j.LogManager; |
35 | 37 | import org.apache.logging.log4j.Logger; |
| 38 | +import org.junit.jupiter.api.AfterEach; |
36 | 39 | import org.junit.jupiter.api.BeforeEach; |
37 | 40 | import org.junit.jupiter.api.Tag; |
38 | 41 |
|
@@ -175,4 +178,12 @@ void setup() { |
175 | 178 | KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(Environment.TEST_SUITE_NAMESPACE, sharedClusterName, KAFKA_REPLICAS).build()); |
176 | 179 | KubeResourceManager.get().createResourceWithWait(KafkaBridgeTemplates.kafkaBridge(Environment.TEST_SUITE_NAMESPACE, sharedClusterName, KafkaResources.plainBootstrapAddress(sharedClusterName), 1).build()); |
177 | 180 | } |
| 181 | + |
| 182 | + @AfterEach |
| 183 | + void cleanup() { |
| 184 | + // In order to properly delete all resources, we need to delete KafkaNodePools first (as the correct deletion is KafkaNodePools -> Kafka) |
| 185 | + // This will ensure everything will be deleted properly |
| 186 | + List<KafkaNodePool> nodePools = CrdClients.kafkaNodePoolClient().inNamespace(Environment.TEST_SUITE_NAMESPACE).list().getItems(); |
| 187 | + KubeResourceManager.get().deleteResourceAsyncWait(nodePools.toArray(new KafkaNodePool[0])); |
| 188 | + } |
178 | 189 | } |
0 commit comments