Replace deprecated method #1746
Conversation
| @@ -12,15 +12,29 @@ | |||
| <artifactId>spring-cloud-kubernetes-integration-tests</artifactId> | |||
| <packaging>pom</packaging> | |||
|
|
|||
| <!-- we need this fix : https://github.com/testcontainers/testcontainers-java/issues/4203, | |||
There was a problem hiding this comment.
I will create an issue for this one, so that we do not forget about it
| @@ -51,8 +50,6 @@ private KubernetesClientCatalogWatchNamespacesDelegate() { | |||
|
|
|||
| private static final String NAMESPACE_B = "namespaceb"; | |||
|
|
|||
| private static final K3sContainer K3S = Commons.container(); | |||
There was a problem hiding this comment.
nothing changes in this test, just use the container that was created previously.
|
|
||
| private static final K3sContainer CONTAINER = new FixedPortsK3sContainer(DockerImageName.parse(Commons.RANCHER)) | ||
| .configureFixedPorts(EXPOSED_PORTS) | ||
| .withFileSystemBind(TEMP_FOLDER, TEMP_FOLDER) |
There was a problem hiding this comment.
this is the core of this change.
withFileSystemBind is deprecated and we are supposed to replace it with withCopyFileToContainer.
When I tried to replace it verbatim, it meant that we need to copy to the k3s container everything that is under two directories:
/tmp/docker/image, these are images like wiremock, busybox, etcTEMP_FOLDER(whatever that path is), and there we keep all of our docker images for integration tests.
When I tried to do that, the process failed with an OOM. The issue is that those directories have lots of images, too much for the JVM to cope with. There is a partial fix for this from testcontainers (testcontainers/testcontainers-java#4203), but it did not help in our case.
As such, I decided to do something different. In each integration test, instead of copying the whole directory, copy only tar files (images) that are needed for that particular integration test.
So the the method that we used to get a hold of the running k3s container (Commons::container) was changed to :
public static K3sContainer container(List<String> ourImages, List<String> images) { ... }
i.e.: pass the images that are strictly needed for a test. In this manner, we do not load the entire directory, but just a few images (most often just one). This in turn means that all callers have to change: all integration tests now need to pass this information further. Not a big deal, of course, but triggers lots of changes
No description provided.