Cleanup in it utilities 4 (#1768)

wind57 · web-flow · commit 4466d78a4cc4 · 2024-10-16T15:52:58.000-04:00
* clean

* clean

* clean

* clean

* clean

* clean

* clean
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java
@@ -117,7 +117,7 @@ static void beforeAll() throws Exception {
 	}
 
 	@AfterAll
-	static void after() throws Exception {
+	static void after() {
 		util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false);
 		util.busybox(NAMESPACE, Phase.DELETE);
 
@@ -132,7 +132,6 @@ static void after() throws Exception {
 		util.deleteNamespace(NAMESPACE_RIGHT);
 
 		manifests(Phase.DELETE);
-		Commons.cleanUp(IMAGE_NAME, K3S);
 	}
 
 	@Test
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-istio/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java
@@ -29,6 +29,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
+import org.testcontainers.containers.Container;
 import org.testcontainers.k3s.K3sContainer;
 import reactor.netty.http.client.HttpClient;
 import reactor.util.retry.Retry;
@@ -42,8 +43,6 @@
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.web.reactive.function.client.WebClient;
 
-import static org.springframework.cloud.kubernetes.integration.tests.commons.Commons.processExecResult;
-
 /**
  * @author wind57
  */
@@ -89,9 +88,8 @@ static void beforeAll() throws Exception {
 	}
 
 	@AfterAll
-	static void afterAll() throws Exception {
+	static void afterAll() {
 		util.deleteNamespace("istio-system");
-		Commons.cleanUp(IMAGE_NAME, K3S);
 	}
 
 	@AfterAll
@@ -156,4 +154,12 @@ private static String istioctlPodName() {
 		}
 	}
 
+	private static String processExecResult(Container.ExecResult execResult) {
+		if (execResult.getExitCode() != 0) {
+			throw new RuntimeException("stdout=" + execResult.getStdout() + "\n" + "stderr=" + execResult.getStderr());
+		}
+
+		return execResult.getStdout();
+	}
+
 }
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadIT.java
@@ -80,10 +80,9 @@ static void beforeAll() throws Exception {
 	}
 
 	@AfterAll
-	static void afterAll() throws Exception {
+	static void afterAll() {
 		util.deleteNamespace("left");
 		util.deleteNamespace("right");
-		Commons.cleanUp(IMAGE_NAME, K3S);
 
 		manifests(Phase.DELETE);
 	}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java
@@ -77,9 +77,8 @@ static void beforeAll() throws Exception {
 	}
 
 	@AfterAll
-	static void afterAll() throws Exception {
+	static void afterAll() {
 		configWatcher(Phase.DELETE);
-		Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);
 	}
 
 	@BeforeEach
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-configuration-watcher/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java
@@ -77,13 +77,12 @@ static void beforeAll() throws Exception {
 	}
 
 	@AfterAll
-	static void afterAll() throws Exception {
+	static void afterAll() {
 		configWatcher(Phase.DELETE);
 		util.wiremock(DEFAULT_NAMESPACE, "/", Phase.DELETE);
 		util.deleteClusterWide(DEFAULT_NAMESPACE, Set.of(DEFAULT_NAMESPACE, LEFT_NAMESPACE, RIGHT_NAMESPACE));
 		util.deleteNamespace(LEFT_NAMESPACE);
 		util.deleteNamespace(RIGHT_NAMESPACE);
-		Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);
 	}
 
 	/**
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java
@@ -178,9 +178,6 @@ static void beforeAll() throws Exception {
 	static void afterAll() throws Exception {
 		rbacApi.deleteClusterRoleBinding(clusterRoleBinding.getMetadata().getName(), null, null, null, null, null,
 				null);
-		Commons.cleanUp(DISCOVERY_SERVER_APP_NAME, K3S);
-		Commons.cleanUp(SPRING_CLOUD_K8S_DISCOVERY_CLIENT_APP_NAME, K3S);
-
 		util.wiremock(NAMESPACE_LEFT, "/wiremock-" + NAMESPACE_LEFT, Phase.DELETE, false);
 		util.wiremock(NAMESPACE_RIGHT, "/wiremock-" + NAMESPACE_RIGHT, Phase.DELETE, false);
 
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java
@@ -90,9 +90,8 @@ static void beforeAll() throws Exception {
 	}
 
 	@AfterAll
-	static void afterAll() throws Exception {
+	static void afterAll() {
 		manifests(Phase.DELETE);
-		Commons.cleanUp(IMAGE_NAME, K3S);
 	}
 
 	/**
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery/src/test/java/org/springframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java
@@ -94,9 +94,7 @@ static void beforeAll() throws Exception {
 	}
 
 	@AfterAll
-	static void afterAll() throws Exception {
-		Commons.cleanUp(IMAGE_NAME, K3S);
-
+	static void afterAll() {
 		util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false);
 		util.wiremock(NAMESPACE_A, "/wiremock", Phase.DELETE, false);
 		util.wiremock(NAMESPACE_B, "/wiremock", Phase.DELETE, false);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-kafka-configmap-reload-multiple-apps/kafka-configmap-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
@@ -24,7 +24,6 @@
 import io.kubernetes.client.openapi.models.V1Deployment;
 import io.kubernetes.client.openapi.models.V1Ingress;
 import io.kubernetes.client.openapi.models.V1Service;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -84,13 +83,6 @@ static void beforeAll() throws Exception {
 		util.setUp(NAMESPACE);
 	}
 
-	@AfterAll
-	static void afterAll() throws Exception {
-		Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);
-		Commons.cleanUp(CONFIG_WATCHER_APP_A_IMAGE, K3S);
-		Commons.cleanUp(CONFIG_WATCHER_APP_B_IMAGE, K3S);
-	}
-
 	@BeforeEach
 	void setup() {
 		util.kafka(NAMESPACE, Phase.CREATE);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-rabbitmq-secret-reload-multiple-apps/rabbitmq-secret-test-app/src/test/java/org/springframework/cloud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
@@ -24,7 +24,6 @@
 import io.kubernetes.client.openapi.models.V1Secret;
 import io.kubernetes.client.openapi.models.V1SecretBuilder;
 import io.kubernetes.client.openapi.models.V1Service;
-import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
@@ -83,13 +82,6 @@ static void beforeAll() throws Exception {
 		util.setUp(NAMESPACE);
 	}
 
-	@AfterAll
-	static void afterAll() throws Exception {
-		Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);
-		Commons.cleanUp(CONFIG_WATCHER_APP_A_IMAGE, K3S);
-		Commons.cleanUp(CONFIG_WATCHER_APP_B_IMAGE, K3S);
-	}
-
 	@BeforeEach
 	void setup() {
 		util.rabbitMq(NAMESPACE, Phase.CREATE);
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/configmap/K8sClientConfigMapReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/configmap/K8sClientConfigMapReloadIT.java
@@ -90,7 +90,6 @@ static void afterAll() throws Exception {
 		manifests(Phase.DELETE);
 		util.deleteNamespace("left");
 		util.deleteNamespace("right");
-		Commons.cleanUp(IMAGE_NAME, K3S);
 	}
 
 	/**
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/secret/K8sClientSecretsReloadIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/secret/K8sClientSecretsReloadIT.java
@@ -75,9 +75,8 @@ static void setup() throws Exception {
 	}
 
 	@AfterAll
-	static void afterAll() throws Exception {
+	static void afterAll() {
 		configK8sClientIt(Phase.DELETE);
-		Commons.cleanUp(IMAGE_NAME, K3S);
 	}
 
 	@Test
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
@@ -120,6 +120,9 @@ public static void assertReloadLogStatements(String left, String right, String a
 
 	}
 
+	/**
+	 * 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 {
 		// save image
 		try (SaveImageCmd saveImageCmd = container.getDockerClient().saveImageCmd(image)) {
@@ -182,22 +185,6 @@ public static void load(K3sContainer container, String tarName, String imageName
 		}
 	}
 
-	private static void loadImageFromPath(String tarName, K3sContainer container) {
-		await().atMost(Duration.ofMinutes(2)).pollInterval(Duration.ofSeconds(1)).until(() -> {
-			Container.ExecResult result = container.execInContainer("ctr", "i", "import", TMP_IMAGES + "/" + tarName);
-			boolean noErrors = result.getStderr() == null || result.getStderr().isEmpty();
-			if (!noErrors) {
-				LOG.info("error is : " + result.getStderr());
-			}
-			return noErrors;
-		});
-	}
-
-	public static void cleanUp(String image, K3sContainer container) throws Exception {
-		container.execInContainer("crictl", "rmi", "docker.io/springcloud/" + image + ":" + pomVersion());
-		container.execInContainer("rm", TEMP_FOLDER + "/" + image + ".tar");
-	}
-
 	/**
 	 * validates that the provided image does exist in the local docker registry.
 	 */
@@ -220,14 +207,6 @@ public static void pullImage(String image, String tag, K3sContainer container) t
 
 	}
 
-	public static String processExecResult(Container.ExecResult execResult) {
-		if (execResult.getExitCode() != 0) {
-			throw new RuntimeException("stdout=" + execResult.getStdout() + "\n" + "stderr=" + execResult.getStderr());
-		}
-
-		return execResult.getStdout();
-	}
-
 	public static String pomVersion() {
 		try (InputStream in = new ClassPathResource(KUBERNETES_VERSION_FILE).getInputStream()) {
 			String version = StreamUtils.copyToString(in, StandardCharsets.UTF_8);
@@ -269,4 +248,15 @@ public static void waitForLogStatement(String message, K3sContainer k3sContainer
 
 	}
 
+	private static void loadImageFromPath(String tarName, K3sContainer container) {
+		await().atMost(Duration.ofMinutes(2)).pollInterval(Duration.ofSeconds(1)).until(() -> {
+			Container.ExecResult result = container.execInContainer("ctr", "i", "import", TMP_IMAGES + "/" + tarName);
+			boolean noErrors = result.getStderr() == null || result.getStderr().isEmpty();
+			if (!noErrors) {
+				LOG.info("error is : " + result.getStderr());
+			}
+			return noErrors;
+		});
+	}
+
 }

Original file line number	Diff line number	Diff line change
`@@ -117,7 +117,7 @@ static void beforeAll() throws Exception {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`@AfterAll`
`120`		`- static void after() throws Exception {`
	`120`	`+ static void after() {`
`121`	`121`	`util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE, false);`
`122`	`122`	`util.busybox(NAMESPACE, Phase.DELETE);`
`123`	`123`
`@@ -132,7 +132,6 @@ static void after() throws Exception {`
`132`	`132`	`util.deleteNamespace(NAMESPACE_RIGHT);`
`133`	`133`
`134`	`134`	`manifests(Phase.DELETE);`
`135`		`- Commons.cleanUp(IMAGE_NAME, K3S);`
`136`	`135`	`}`
`137`	`136`
`138`	`137`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -80,10 +80,9 @@ static void beforeAll() throws Exception {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@AfterAll`
`83`		`- static void afterAll() throws Exception {`
	`83`	`+ static void afterAll() {`
`84`	`84`	`util.deleteNamespace("left");`
`85`	`85`	`util.deleteNamespace("right");`
`86`		`- Commons.cleanUp(IMAGE_NAME, K3S);`
`87`	`86`
`88`	`87`	`manifests(Phase.DELETE);`
`89`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,9 +77,8 @@ static void beforeAll() throws Exception {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@AfterAll`
`80`		`- static void afterAll() throws Exception {`
	`80`	`+ static void afterAll() {`
`81`	`81`	`configWatcher(Phase.DELETE);`
`82`		`- Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);`
`83`	`82`	`}`
`84`	`83`
`85`	`84`	`@BeforeEach`
Original file line number	Diff line number	Diff line change
`@@ -77,13 +77,12 @@ static void beforeAll() throws Exception {`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@AfterAll`
`80`		`- static void afterAll() throws Exception {`
	`80`	`+ static void afterAll() {`
`81`	`81`	`configWatcher(Phase.DELETE);`
`82`	`82`	`util.wiremock(DEFAULT_NAMESPACE, "/", Phase.DELETE);`
`83`	`83`	`util.deleteClusterWide(DEFAULT_NAMESPACE, Set.of(DEFAULT_NAMESPACE, LEFT_NAMESPACE, RIGHT_NAMESPACE));`
`84`	`84`	`util.deleteNamespace(LEFT_NAMESPACE);`
`85`	`85`	`util.deleteNamespace(RIGHT_NAMESPACE);`
`86`		`- Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);`
`87`	`86`	`}`
`88`	`87`
`89`	`88`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -90,9 +90,8 @@ static void beforeAll() throws Exception {`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`@AfterAll`
`93`		`- static void afterAll() throws Exception {`
	`93`	`+ static void afterAll() {`
`94`	`94`	`manifests(Phase.DELETE);`
`95`		`- Commons.cleanUp(IMAGE_NAME, K3S);`
`96`	`95`	`}`
`97`	`96`
`98`	`97`	`/**`