From 96f3b37bacde27ecb47e00089202bfb0212ded10 Mon Sep 17 00:00:00 2001 From: erabii Date: Sun, 6 Oct 2024 15:42:06 +0300 Subject: [PATCH] fix (#1754) --- .../tests/commons/fabric8_client/Util.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java index e19f68b7..0b582812 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java @@ -27,6 +27,7 @@ import java.util.concurrent.TimeUnit; import io.fabric8.kubernetes.api.model.ConfigMap; import io.fabric8.kubernetes.api.model.NamespaceBuilder; import io.fabric8.kubernetes.api.model.Pod; +import io.fabric8.kubernetes.api.model.PodListBuilder; import io.fabric8.kubernetes.api.model.Secret; import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServiceAccount; @@ -151,10 +152,20 @@ public final class Util { @Nullable Ingress ingress) { try { + long startTime = System.currentTimeMillis(); if (deployment != null) { - client.apps().deployments().inNamespace(namespace).resource(deployment).delete(); + + List deploymentPods = client.pods() + .inNamespace(namespace) + .withLabels(deployment.getSpec().getSelector().getMatchLabels()) + .list() + .getItems(); + + client.resourceList(new PodListBuilder().withItems(deploymentPods).build()).withGracePeriod(0).delete(); + client.apps().deployments().inNamespace(namespace).resource(deployment).withGracePeriod(0).delete(); waitForDeploymentToBeDeleted(namespace, deployment); } + System.out.println("Ended deployment delete in " + (System.currentTimeMillis() - startTime) + "ms"); client.services().inNamespace(namespace).resource(service).delete();