Skip to content

Commit 8559cc9

Browse files
authored
[ST] Fix RecoveryST failing on deletion of PVCs and change Kafka deletion to background (#12092)
Signed-off-by: Lukas Kral <lukywill16@gmail.com>
1 parent fd0f12d commit 8559cc9

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

systemtest/src/main/java/io/strimzi/systemtest/resources/types/KafkaType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void delete(Kafka kafka) {
9191
// proceed only if kafka is still present as Kafka is purposefully deleted in some test cases
9292
if (currentKafka != null) {
9393
client.inNamespace(namespaceName).withName(
94-
kafka.getMetadata().getName()).withPropagationPolicy(DeletionPropagation.FOREGROUND).delete();
94+
kafka.getMetadata().getName()).withPropagationPolicy(DeletionPropagation.BACKGROUND).delete();
9595
}
9696
}
9797

systemtest/src/test/java/io/strimzi/systemtest/operators/RecoveryST.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
import io.fabric8.kubernetes.api.model.ResourceRequirementsBuilder;
1212
import io.skodjob.testframe.resources.KubeResourceManager;
1313
import io.strimzi.api.kafka.model.kafka.KafkaResources;
14+
import io.strimzi.api.kafka.model.nodepool.KafkaNodePool;
1415
import io.strimzi.systemtest.AbstractST;
1516
import io.strimzi.systemtest.Environment;
1617
import io.strimzi.systemtest.TestConstants;
1718
import io.strimzi.systemtest.annotations.IsolatedTest;
1819
import io.strimzi.systemtest.kafkaclients.internalClients.KafkaClients;
1920
import io.strimzi.systemtest.labels.LabelSelectors;
21+
import io.strimzi.systemtest.resources.CrdClients;
2022
import io.strimzi.systemtest.resources.crd.KafkaComponents;
2123
import io.strimzi.systemtest.resources.operator.ClusterOperatorConfigurationBuilder;
2224
import io.strimzi.systemtest.resources.operator.SetupClusterOperator;
@@ -33,6 +35,7 @@
3335
import io.strimzi.systemtest.utils.kubeUtils.objects.ServiceUtils;
3436
import org.apache.logging.log4j.LogManager;
3537
import org.apache.logging.log4j.Logger;
38+
import org.junit.jupiter.api.AfterEach;
3639
import org.junit.jupiter.api.BeforeEach;
3740
import org.junit.jupiter.api.Tag;
3841

@@ -175,4 +178,12 @@ void setup() {
175178
KubeResourceManager.get().createResourceWithWait(KafkaTemplates.kafka(Environment.TEST_SUITE_NAMESPACE, sharedClusterName, KAFKA_REPLICAS).build());
176179
KubeResourceManager.get().createResourceWithWait(KafkaBridgeTemplates.kafkaBridge(Environment.TEST_SUITE_NAMESPACE, sharedClusterName, KafkaResources.plainBootstrapAddress(sharedClusterName), 1).build());
177180
}
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+
}
178189
}

0 commit comments

Comments
 (0)