From 0efc2408fffa790708fbd36dc5f2f48fe1f601bb Mon Sep 17 00:00:00 2001 From: wind57 Date: Wed, 2 Apr 2025 21:55:09 +0300 Subject: [PATCH] fix Signed-off-by: wind57 --- .../tests/commons/native_client/Util.java | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java index b9e813a890..dccf593cc0 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java @@ -195,8 +195,8 @@ public void createNamespace(String name) { public void deleteAndWait(String namespace, V1Deployment deployment, V1Service service) { - if (deployment != null) { - try { + try { + if (deployment != null) { String deploymentName = deploymentName(deployment); Map podLabels = appsV1Api.readNamespacedDeployment(deploymentName, namespace, null) .getSpec() @@ -208,20 +208,19 @@ public void deleteAndWait(String namespace, V1Deployment deployment, V1Service s labelSelector(podLabels), null, null, null, null, null, null, null, null); waitForDeploymentToBeDeleted(deploymentName, namespace); waitForDeploymentPodsToBeDeleted(podLabels, namespace); + } - if (service != null) { - 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); + waitForServiceToBeDeleted(service.getMetadata().getName(), namespace); } } + catch (Exception e) { + throw new RuntimeException(e); + } } public void busybox(String namespace, Phase phase) {