Skip to content

Cleanup in it utilities 4 #1768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Oct 16, 2024
Merged

Cleanup in it utilities 4 #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1201501
clean
wind57 Oct 16, 2024
35d7b19
clean
wind57 Oct 16, 2024
9a3c4c7
clean
wind57 Oct 16, 2024
926bb1c
clean
wind57 Oct 16, 2024
bf2a1b1
clean
wind57 Oct 16, 2024
435c173
clean
wind57 Oct 16, 2024
a8e57f2
clean
wind57 Oct 16, 2024
9339740
merge
wind57 Oct 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...ingframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryPodMetadataIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -132,7 +132,6 @@ static void after() throws Exception {
util.deleteNamespace(NAMESPACE_RIGHT);

manifests(Phase.DELETE);
Commons.cleanUp(IMAGE_NAME, K3S);
}

@Test
Expand Down
14 changes: 10 additions & 4 deletions ...c/test/java/org/springframework/cloud/kubernetes/fabric8/client/istio/Fabric8IstioIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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
*/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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();
}

}
3 changes: 1 addition & 2 deletions ...java/org/springframework/cloud/kubernetes/fabric8/client/reload/Fabric8EventReloadIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
3 changes: 1 addition & 2 deletions ...st/java/org/springframework/cloud/kubernetes/configuration/watcher/ActuatorRefreshIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...framework/cloud/kubernetes/configuration/watcher/ActuatorRefreshMultipleNamespacesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
3 changes: 0 additions & 3 deletions .../test/java/org/springframework/cloud/kubernetes/discoveryclient/it/DiscoveryClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
3 changes: 1 addition & 2 deletions ...ingframework/cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoveryClientIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/**
Expand Down
4 changes: 1 addition & 3 deletions ...cloud/kubernetes/k8s/client/discovery/KubernetesClientDiscoverySelectiveNamespacesIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions ...ud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppsIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 0 additions & 8 deletions ...oud/kubernetes/configuration/watcher/multiple/apps/ConfigurationWatcherMultipleAppIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
1 change: 0 additions & 1 deletion ...ingframework/cloud/kubernetes/k8s/client/reload/configmap/K8sClientConfigMapReloadIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ static void afterAll() throws Exception {
manifests(Phase.DELETE);
util.deleteNamespace("left");
util.deleteNamespace("right");
Commons.cleanUp(IMAGE_NAME, K3S);
}

/**
Expand Down
3 changes: 1 addition & 2 deletions ...g/springframework/cloud/kubernetes/k8s/client/reload/secret/K8sClientSecretsReloadIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 14 additions & 24 deletions ...src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/Commons.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down Expand Up @@ -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.
*/
Expand All @@ -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);
Expand Down Expand Up @@ -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;
});
}

}
Loading