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

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Ryan Baxter
2025-04-02 10:35:20 -04:00
parent b4847f2a45 a9fd87bc7e
commit 1c6b725b3e
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -132,7 +132,7 @@ public final class Util {
}
}
public void deleteAndWait(String namespace, @Nullable Deployment deployment, Service service) {
public void deleteAndWait(String namespace, @Nullable Deployment deployment, @Nullable Service service) {
try {
long startTime = System.currentTimeMillis();
@@ -150,7 +150,10 @@ public final class Util {
}
System.out.println("Ended deployment delete in " + (System.currentTimeMillis() - startTime) + "ms");
client.services().inNamespace(namespace).resource(service).delete();
if (service != null) {
client.services().inNamespace(namespace).resource(service).delete();
waitForServiceToBeDeleted(namespace, service);
}
}
catch (Exception e) {
@@ -363,6 +366,16 @@ public final class Util {
});
}
private void waitForServiceToBeDeleted(String namespace, Service service) {
String serviceName = service.getMetadata().getName();
await().pollInterval(Duration.ofSeconds(1)).atMost(30, TimeUnit.SECONDS).until(() -> {
Service inner = client.services().inNamespace(namespace).withName(serviceName).get();
return inner == null;
});
}
private void waitForDeployment(String namespace, Deployment deployment) {
String deploymentName = deploymentName(deployment);
await().pollInterval(Duration.ofSeconds(2))

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

@@ -209,9 +209,13 @@ public final class Util {
waitForDeploymentToBeDeleted(deploymentName, namespace);
waitForDeploymentPodsToBeDeleted(podLabels, namespace);
service.getMetadata().setNamespace(namespace);
coreV1Api.deleteNamespacedService(service.getMetadata().getName(), service.getMetadata().getNamespace(),
if (service != null) {
service.getMetadata().setNamespace(namespace);
coreV1Api.deleteNamespacedService(service.getMetadata().getName(), service.getMetadata().getNamespace(),
null, null, null, null, null, null);
waitForServiceToBeDeleted(service.getMetadata().getName(), namespace);
}
}
catch (Exception e) {
throw new RuntimeException(e);
@@ -507,6 +511,21 @@ public final class Util {
});
}
private void waitForServiceToBeDeleted(String serviceName, String namespace) {
await().timeout(Duration.ofSeconds(180)).until(() -> {
try {
coreV1Api.readNamespacedService(serviceName, namespace, null);
return false;
}
catch (ApiException e) {
if (e.getCode() == HttpURLConnection.HTTP_NOT_FOUND) {
return true;
}
throw new RuntimeException(e);
}
});
}
private void waitForDeploymentPodsToBeDeleted(Map<String, String> labels, String namespace) {
await().timeout(Duration.ofSeconds(180)).until(() -> {
try {