From ba5d26bf6775941c2de8f8a996cc22454a5f4c2b Mon Sep 17 00:00:00 2001 From: erabii Date: Tue, 1 Oct 2024 15:44:52 +0300 Subject: [PATCH] replace deprecated method (#1751) --- .../integration/tests/commons/Commons.java | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java index 50c457f0..4fc2136f 100644 --- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java +++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java @@ -26,12 +26,15 @@ import java.nio.file.Paths; import java.time.Duration; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.Optional; import java.util.concurrent.TimeUnit; import com.github.dockerjava.api.command.ListImagesCmd; import com.github.dockerjava.api.command.PullImageCmd; import com.github.dockerjava.api.command.SaveImageCmd; +import com.github.dockerjava.api.model.Bind; +import com.github.dockerjava.api.model.HostConfig; import com.github.dockerjava.api.model.Image; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -90,9 +93,8 @@ public final class Commons { public static final String TEMP_FOLDER = new File(System.getProperty("java.io.tmpdir")).getAbsolutePath(); private static final K3sContainer CONTAINER = new FixedPortsK3sContainer(DockerImageName.parse(Commons.RANCHER)) - .configureFixedPorts(EXPOSED_PORTS) - .withFileSystemBind(TEMP_FOLDER, TEMP_FOLDER) - .withFileSystemBind(TMP_IMAGES, TMP_IMAGES) + .configureFixedPorts() + .addBinds() .withCommand(Commons.RANCHER_COMMAND) .withReuse(true); @@ -331,13 +333,23 @@ public final class Commons { super(dockerImageName); } - private FixedPortsK3sContainer configureFixedPorts(int[] ports) { - for (int port : ports) { + private FixedPortsK3sContainer configureFixedPorts() { + for (int port : Commons.EXPOSED_PORTS) { super.addFixedExposedPort(port, port); } return this; } + private FixedPortsK3sContainer addBinds() { + super.withCreateContainerCmdModifier(cmd -> { + HostConfig hostConfig = Objects.requireNonNull(cmd.getHostConfig()); + hostConfig.withBinds(Bind.parse(TEMP_FOLDER + ":" + TEMP_FOLDER), + Bind.parse(TMP_IMAGES + ":" + TMP_IMAGES)); + }); + + return this; + } + } }