SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix (#1754)

Browse Source
This commit is contained in:
erabii
2024-10-06 15:42:06 +03:00
committed by GitHub
parent 80974a02d9
commit 96f3b37bac
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<Pod> 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();