Cleanup in integration tests utilities 3 (#1767)

wind57 · web-flow · commit 0900b73ee66d · 2024-10-16T10:22:13.000-04:00
* 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
@@ -133,7 +133,6 @@ static void after() throws Exception {
 
 		manifests(Phase.DELETE);
 		Commons.cleanUp(IMAGE_NAME, K3S);
-		Commons.systemPrune();
 	}
 
 	@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
@@ -92,7 +92,6 @@ static void beforeAll() throws Exception {
 	static void afterAll() throws Exception {
 		util.deleteNamespace("istio-system");
 		Commons.cleanUp(IMAGE_NAME, K3S);
-		Commons.systemPrune();
 	}
 
 	@AfterAll
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
@@ -84,7 +84,6 @@ static void afterAll() throws Exception {
 		util.deleteNamespace("left");
 		util.deleteNamespace("right");
 		Commons.cleanUp(IMAGE_NAME, K3S);
-		Commons.systemPrune();
 
 		manifests(Phase.DELETE);
 	}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-catalog-watcher/src/test/java/org/springframework/cloud/kubernetes/k8s/client/catalog/watcher/KubernetesClientCatalogWatchIT.java
@@ -90,7 +90,6 @@ static void afterAll() {
 		util.deleteNamespace(NAMESPACE_A);
 		util.deleteNamespace(NAMESPACE_B);
 		app(Phase.DELETE);
-		Commons.systemPrune();
 	}
 
 	@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/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
@@ -80,7 +80,6 @@ static void beforeAll() throws Exception {
 	static void afterAll() throws Exception {
 		configWatcher(Phase.DELETE);
 		Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);
-		Commons.systemPrune();
 	}
 
 	@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
@@ -84,7 +84,6 @@ static void afterAll() throws Exception {
 		util.deleteNamespace(LEFT_NAMESPACE);
 		util.deleteNamespace(RIGHT_NAMESPACE);
 		Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);
-		Commons.systemPrune();
 	}
 
 	/**
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
@@ -189,7 +189,6 @@ static void afterAll() throws Exception {
 
 		discoveryServer(Phase.DELETE);
 		discoveryClient(Phase.DELETE);
-		Commons.systemPrune();
 	}
 
 	@Test
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
@@ -93,7 +93,6 @@ static void beforeAll() throws Exception {
 	static void afterAll() throws Exception {
 		manifests(Phase.DELETE);
 		Commons.cleanUp(IMAGE_NAME, K3S);
-		Commons.systemPrune();
 	}
 
 	/**
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
@@ -104,7 +104,6 @@ static void afterAll() throws Exception {
 		util.deleteNamespace(NAMESPACE_A);
 		util.deleteNamespace(NAMESPACE_B);
 		manifests(Phase.DELETE);
-		Commons.systemPrune();
 	}
 
 	/**
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
@@ -89,7 +89,6 @@ 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);
-		Commons.systemPrune();
 	}
 
 	@BeforeEach
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
@@ -88,7 +88,6 @@ 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);
-		Commons.systemPrune();
 	}
 
 	@BeforeEach
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
@@ -91,7 +91,6 @@ static void afterAll() throws Exception {
 		util.deleteNamespace("left");
 		util.deleteNamespace("right");
 		Commons.cleanUp(IMAGE_NAME, K3S);
-		Commons.systemPrune();
 	}
 
 	/**
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
@@ -78,7 +78,6 @@ static void setup() throws Exception {
 	static void afterAll() throws Exception {
 		configK8sClientIt(Phase.DELETE);
 		Commons.cleanUp(IMAGE_NAME, K3S);
-		Commons.systemPrune();
 	}
 
 	@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
@@ -156,7 +156,7 @@ public static void load(K3sContainer container, String tarName, String imageName
 					.findFirst();
 				if (found.isPresent()) {
 					LOG.info("running in github actions, will load from : " + TMP_IMAGES + " tar : " + found.get());
-					Commons.loadImageFromPath(found.get(), container);
+					loadImageFromPath(found.get(), container);
 					return;
 				}
 				else {
@@ -174,8 +174,8 @@ public static void load(K3sContainer container, String tarName, String imageName
 		try {
 			LOG.info("no tars found, will resort to pulling the image");
 			LOG.info("using : " + imageVersion + " for : " + imageNameForDownload);
-			Commons.pullImage(imageNameForDownload, imageVersion, container);
-			Commons.loadImage(imageNameForDownload, imageVersion, tarName, container);
+			pullImage(imageNameForDownload, imageVersion, container);
+			loadImage(imageNameForDownload, imageVersion, tarName, container);
 		}
 		catch (Exception e) {
 			throw new RuntimeException(e);
@@ -198,10 +198,6 @@ public static void cleanUp(String image, K3sContainer container) throws Exceptio
 		container.execInContainer("rm", TEMP_FOLDER + "/" + image + ".tar");
 	}
 
-	public static void cleanUpDownloadedImage(String image) throws Exception {
-		CONTAINER.execInContainer("crictl", "rmi", image);
-	}
-
 	/**
 	 * validates that the provided image does exist in the local docker registry.
 	 */
@@ -232,19 +228,6 @@ public static String processExecResult(Container.ExecResult execResult) {
 		return execResult.getStdout();
 	}
 
-	/**
-	 * equivalent of 'docker system prune', but for crictl.
-	 */
-	public static void systemPrune() {
-		try {
-			CONTAINER.execInContainer("sh", "-c",
-					"crictl ps -a | grep -v Running | awk '{print $1}' | xargs crictl rm && crictl rmi --prune");
-		}
-		catch (Exception e) {
-			throw new RuntimeException(e);
-		}
-	}
-
 	public static String pomVersion() {
 		try (InputStream in = new ClassPathResource(KUBERNETES_VERSION_FILE).getInputStream()) {
 			String version = StreamUtils.copyToString(in, StandardCharsets.UTF_8);

Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,6 @@ static void after() throws Exception {`
`133`	`133`
`134`	`134`	`manifests(Phase.DELETE);`
`135`	`135`	`Commons.cleanUp(IMAGE_NAME, K3S);`
`136`		`- Commons.systemPrune();`
`137`	`136`	`}`
`138`	`137`
`139`	`138`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,6 @@ static void beforeAll() throws Exception {`
`92`	`92`	`static void afterAll() throws Exception {`
`93`	`93`	`util.deleteNamespace("istio-system");`
`94`	`94`	`Commons.cleanUp(IMAGE_NAME, K3S);`
`95`		`- Commons.systemPrune();`
`96`	`95`	`}`
`97`	`96`
`98`	`97`	`@AfterAll`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ static void afterAll() throws Exception {`
`84`	`84`	`util.deleteNamespace("left");`
`85`	`85`	`util.deleteNamespace("right");`
`86`	`86`	`Commons.cleanUp(IMAGE_NAME, K3S);`
`87`		`- Commons.systemPrune();`
`88`	`87`
`89`	`88`	`manifests(Phase.DELETE);`
`90`	`89`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,6 @@ static void afterAll() {`
`90`	`90`	`util.deleteNamespace(NAMESPACE_A);`
`91`	`91`	`util.deleteNamespace(NAMESPACE_B);`
`92`	`92`	`app(Phase.DELETE);`
`93`		`- Commons.systemPrune();`
`94`	`93`	`}`
`95`	`94`
`96`	`95`	`@BeforeEach`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,6 @@ static void beforeAll() throws Exception {`
`80`	`80`	`static void afterAll() throws Exception {`
`81`	`81`	`configWatcher(Phase.DELETE);`
`82`	`82`	`Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);`
`83`		`- Commons.systemPrune();`
`84`	`83`	`}`
`85`	`84`
`86`	`85`	`@BeforeEach`
Original file line number	Diff line number	Diff line change
`@@ -189,7 +189,6 @@ static void afterAll() throws Exception {`
`189`	`189`
`190`	`190`	`discoveryServer(Phase.DELETE);`
`191`	`191`	`discoveryClient(Phase.DELETE);`
`192`		`- Commons.systemPrune();`
`193`	`192`	`}`
`194`	`193`
`195`	`194`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,6 @@ static void beforeAll() throws Exception {`
`93`	`93`	`static void afterAll() throws Exception {`
`94`	`94`	`manifests(Phase.DELETE);`
`95`	`95`	`Commons.cleanUp(IMAGE_NAME, K3S);`
`96`		`- Commons.systemPrune();`
`97`	`96`	`}`
`98`	`97`
`99`	`98`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,6 @@ static void afterAll() throws Exception {`
`104`	`104`	`util.deleteNamespace(NAMESPACE_A);`
`105`	`105`	`util.deleteNamespace(NAMESPACE_B);`
`106`	`106`	`manifests(Phase.DELETE);`
`107`		`- Commons.systemPrune();`
`108`	`107`	`}`
`109`	`108`
`110`	`109`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,6 @@ static void afterAll() throws Exception {`
`89`	`89`	`Commons.cleanUp(SPRING_CLOUD_K8S_CONFIG_WATCHER_APP_NAME, K3S);`
`90`	`90`	`Commons.cleanUp(CONFIG_WATCHER_APP_A_IMAGE, K3S);`
`91`	`91`	`Commons.cleanUp(CONFIG_WATCHER_APP_B_IMAGE, K3S);`
`92`		`- Commons.systemPrune();`
`93`	`92`	`}`
`94`	`93`
`95`	`94`	`@BeforeEach`