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-05-06 11:18:04 -04:00
parent 9726bcc9a7 e34c8928b1
commit 078e7af1db
49 changed files with 1361 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,12 +53,12 @@ import io.kubernetes.client.util.Yaml;
import jakarta.annotation.Nullable;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.assertj.core.api.Assertions;
import org.testcontainers.k3s.K3sContainer;
import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
import static org.assertj.core.api.Fail.fail;
import static org.awaitility.Awaitility.await;
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.loadImage;
import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.pomVersion;
@@ -548,7 +548,7 @@ public final class Util {
V1DeploymentList deployments = appsV1Api.listNamespacedDeployment(namespace, null, null, null,
"metadata.name=" + deploymentName, null, null, null, null, null, null, null);
if (deployments.getItems().isEmpty()) {
fail("No deployments with the name " + deploymentName);
Assertions.fail("No deployments with the name " + deploymentName);
}
V1Deployment deployment = deployments.getItems().get(0);
if (deployment.getStatus() != null) {
@@ -580,7 +580,7 @@ public final class Util {
V1DeploymentList deployments = new AppsV1Api().listNamespacedDeployment(namespace, null, null, null,
"metadata.name=" + deploymentName, null, null, null, null, null, null, null);
if (deployments.getItems().isEmpty()) {
fail("No deployment with name " + deploymentName);
Assertions.fail("No deployment with name " + deploymentName);
}
V1Deployment deployment = deployments.getItems().get(0);