Skip to content

Commit 96f3b37

Browse files
authored
fix (#1754)
1 parent 80974a0 commit 96f3b37

File tree

1 file changed

+12
-1
lines changed
  • spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client

1 file changed

+12
-1
lines changed

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/fabric8_client/Util.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import io.fabric8.kubernetes.api.model.ConfigMap;
2828
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
2929
import io.fabric8.kubernetes.api.model.Pod;
30+
import io.fabric8.kubernetes.api.model.PodListBuilder;
3031
import io.fabric8.kubernetes.api.model.Secret;
3132
import io.fabric8.kubernetes.api.model.Service;
3233
import io.fabric8.kubernetes.api.model.ServiceAccount;
@@ -151,10 +152,20 @@ public void deleteAndWait(String namespace, @Nullable Deployment deployment, Ser
151152
@Nullable Ingress ingress) {
152153
try {
153154

155+
long startTime = System.currentTimeMillis();
154156
if (deployment != null) {
155-
client.apps().deployments().inNamespace(namespace).resource(deployment).delete();
157+
158+
List<Pod> deploymentPods = client.pods()
159+
.inNamespace(namespace)
160+
.withLabels(deployment.getSpec().getSelector().getMatchLabels())
161+
.list()
162+
.getItems();
163+
164+
client.resourceList(new PodListBuilder().withItems(deploymentPods).build()).withGracePeriod(0).delete();
165+
client.apps().deployments().inNamespace(namespace).resource(deployment).withGracePeriod(0).delete();
156166
waitForDeploymentToBeDeleted(namespace, deployment);
157167
}
168+
System.out.println("Ended deployment delete in " + (System.currentTimeMillis() - startTime) + "ms");
158169

159170
client.services().inNamespace(namespace).resource(service).delete();
160171

0 commit comments

Comments
 (0)