Skip to content

remove services in correct order #1913

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 2, 2025
Merged

remove services in correct order #1913

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions ...va/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<String, String> podLabels = appsV1Api.readNamespacedDeployment(deploymentName, namespace, null)
.getSpec()
Expand All @@ -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) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was my mistake, of course. I was doing :

if (deployment != null) {

        if (service != null) { .... }
}

but for the external-name service, deployment is null, but service is not.

And obviously, I was not removing it. This PR corrects this mistake.

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) {
Expand Down
Loading