merge 3.1.x

wind57 · wind57 · commit f5f666ff8934 · 2024-10-18T17:36:46.000+03:00
diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Images.java
@@ -83,9 +83,7 @@ public static void loadBusybox(K3sContainer container) {
 	}
 
 	public static void loadWiremock(K3sContainer container) {
-		if (!imageAlreadyInK3s(container, WIREMOCK_TAR)) {
-			Commons.load(container, WIREMOCK_TAR, WIREMOCK, wiremockVersion());
-		}
+		Commons.load(container, WIREMOCK_TAR, WIREMOCK, wiremockVersion());
 	}
 
 	public static void loadIstioCtl(K3sContainer container) {

Original file line number	Diff line number	Diff line change
`@@ -83,9 +83,7 @@ public static void loadBusybox(K3sContainer container) {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`public static void loadWiremock(K3sContainer container) {`
`86`		`- if (!imageAlreadyInK3s(container, WIREMOCK_TAR)) {`
`87`		`- Commons.load(container, WIREMOCK_TAR, WIREMOCK, wiremockVersion());`
`88`		`- }`
	`86`	`+ Commons.load(container, WIREMOCK_TAR, WIREMOCK, wiremockVersion());`
`89`	`87`	`}`
`90`	`88`
`91`	`89`	`public static void loadIstioCtl(K3sContainer container) {`