SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Ryan Baxter
2024-10-23 14:17:19 -04:00
parent c6429b3ef5 0c8a398310
commit abcccc8af3
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java
View File

@@ -124,6 +124,11 @@ public final class Commons {
* create a tar, copy it in the running k3s and load this tar as an image.
*/
public static void loadImage(String image, String tag, String tarName, K3sContainer container) throws Exception {
if (imageAlreadyInK3s(container, tarName)) {
return;
}
// save image
try (SaveImageCmd saveImageCmd = container.getDockerClient().saveImageCmd(image)) {
InputStream imageStream = saveImageCmd.withTag(tag).exec();
@@ -182,7 +187,7 @@ public final class Commons {
try {
LOG.info("no tars found, will resort to pulling the image");
LOG.info("using : " + imageVersion + " for : " + imageNameForDownload);
pullImage(imageNameForDownload, imageVersion, container);
pullImage(imageNameForDownload, imageVersion, tarName, container);
loadImage(imageNameForDownload, imageVersion, tarName, container);
}
catch (Exception e) {
@@ -205,7 +210,13 @@ public final class Commons {
}
}
public static void pullImage(String image, String tag, K3sContainer container) throws InterruptedException {
public static void pullImage(String image, String tag, String tarName, K3sContainer container)
throws InterruptedException {
if (imageAlreadyInK3s(container, tarName)) {
return;
}
try (PullImageCmd pullImageCmd = container.getDockerClient().pullImageCmd(image)) {
pullImageCmd.withTag(tag).start().awaitCompletion();
}
@@ -265,6 +276,11 @@ public final class Commons {
}
private static boolean imageAlreadyInK3s(K3sContainer container, String tarName) {
if (tarName == null) {
return false;
}
try {
boolean present = container.execInContainer("sh", "-c", "ctr images list | grep " + tarName)
.getStdout()

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

@@ -103,7 +103,7 @@ public final class Util {
}
else {
String[] image = imageFromDeployment.split(":", 2);
pullImage(image[0], image[1], container);
pullImage(image[0], image[1], name, container);
loadImage(image[0], image[1], name, container);
}

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

@@ -136,7 +136,7 @@ public final class Util {
}
else {
String[] image = imageFromDeployment.split(":", 2);
pullImage(image[0], image[1], container);
pullImage(image[0], image[1], name, container);
loadImage(image[0], image[1], name, container);
}