envVars = new ArrayList<>(
- Optional.ofNullable(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv())
- .orElse(List.of()));
- V1EnvVar debugLevel = new V1EnvVar().name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY")
- .value("DEBUG");
- V1EnvVar includeLabelMetadata = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_METADATA_ADDLABELS")
- .value("TRUE");
- V1EnvVar includeLabelMetadataPrefix = new V1EnvVar()
- .name("SPRING_CLOUD_KUBERNETES_DISCOVERY_METADATA_LABELSPREFIX").value("label-");
- V1EnvVar includeAnnotationsMetadata = new V1EnvVar()
- .name("SPRING_CLOUD_KUBERNETES_DISCOVERY_METADATA_ADDANNOTATIONS").value("TRUE");
- V1EnvVar includeAnnotationsMetadataPrefix = new V1EnvVar()
- .name("SPRING_CLOUD_KUBERNETES_DISCOVERY_METADATA_ANNOTATIONSPREFIX").value("annotation-");
-
- envVars.add(debugLevel);
- envVars.add(includeLabelMetadata);
- envVars.add(includeLabelMetadataPrefix);
- envVars.add(includeAnnotationsMetadata);
- envVars.add(includeAnnotationsMetadataPrefix);
- deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
-
- if (phase.equals(Phase.CREATE)) {
- util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
- }
- else if (phase.equals(Phase.DELETE)) {
- util.deleteAndWait(NAMESPACE, deployment, service, ingress);
- }
- }
-
private WebClient.Builder builder() {
return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
}
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySingleSelectiveNamespaceIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java
similarity index 70%
rename from spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySingleSelectiveNamespaceIT.java
rename to spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java
index 458b204f..f6e8f021 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySingleSelectiveNamespaceIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/java/org/springframework/cloud/kubernetes/client/discovery/it/KubernetesClientDiscoverySelectiveNamespacesIT.java
@@ -19,6 +19,7 @@ package org.springframework.cloud.kubernetes.client.discovery.it;
import java.time.Duration;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
@@ -30,7 +31,10 @@ import io.kubernetes.client.openapi.models.V1Service;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.MethodOrderer;
+import org.junit.jupiter.api.Order;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.TestMethodOrder;
import org.testcontainers.containers.Container;
import org.testcontainers.k3s.K3sContainer;
import reactor.netty.http.client.HttpClient;
@@ -49,7 +53,8 @@ import org.springframework.web.reactive.function.client.WebClient;
/**
* @author wind57
*/
-class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
+@TestMethodOrder(MethodOrderer.OrderAnnotation.class)
+class KubernetesClientDiscoverySelectiveNamespacesIT {
private static final String BLOCKING_PUBLISH = "Will publish InstanceRegisteredEvent from blocking implementation";
@@ -63,6 +68,8 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
private static final String IMAGE_NAME = "spring-cloud-kubernetes-client-discovery-it";
+ private static final String DEPLOYMENT_NAME = "spring-cloud-kubernetes-client-discovery-deployment-it";
+
private static Util util;
private static final K3sContainer K3S = Commons.container();
@@ -74,7 +81,6 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
Commons.loadSpringCloudKubernetesImage(IMAGE_NAME, K3S);
util = new Util(K3S);
- Commons.systemPrune();
util.createNamespace(NAMESPACE_A);
util.createNamespace(NAMESPACE_B);
@@ -82,10 +88,11 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
util.wiremock(NAMESPACE, "/wiremock", Phase.CREATE);
util.wiremock(NAMESPACE_A, "/wiremock", Phase.CREATE);
util.wiremock(NAMESPACE_B, "/wiremock", Phase.CREATE);
+ manifests(Phase.CREATE);
}
@AfterAll
- static void after() throws Exception {
+ static void afterAll() throws Exception {
Commons.cleanUp(IMAGE_NAME, K3S);
util.wiremock(NAMESPACE, "/wiremock", Phase.DELETE);
@@ -94,6 +101,7 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
util.deleteClusterWide(NAMESPACE, Set.of(NAMESPACE, NAMESPACE_A, NAMESPACE_B));
util.deleteNamespace(NAMESPACE_A);
util.deleteNamespace(NAMESPACE_B);
+ manifests(Phase.DELETE);
}
/**
@@ -102,10 +110,9 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
* its service instance.
*/
@Test
+ @Order(1)
void testOneNamespaceBlockingOnly() {
- manifests(Phase.CREATE, false, true);
-
String logs = logs();
Assertions.assertTrue(logs.contains("using selective namespaces : [a]"));
Assertions.assertTrue(
@@ -121,8 +128,6 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
blockingCheck();
- manifests(Phase.DELETE, false, true);
-
}
/**
@@ -131,9 +136,12 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
* its service instance.
*/
@Test
+ @Order(2)
void testOneNamespaceReactiveOnly() {
- manifests(Phase.CREATE, true, false);
+ KubernetesClientDiscoveryClientUtils.patchForReactiveOnly(DEPLOYMENT_NAME, NAMESPACE);
+ util.waitForDeploymentAfterPatch(DEPLOYMENT_NAME, NAMESPACE,
+ Map.of("app", "spring-cloud-kubernetes-client-discovery-it"));
String logs = logs();
Assertions.assertTrue(logs.contains("using selective namespaces : [a]"));
@@ -150,8 +158,6 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
reactiveCheck();
- manifests(Phase.DELETE, true, false);
-
}
/**
@@ -160,9 +166,12 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
* its service instance.
*/
@Test
+ @Order(3)
void testOneNamespaceBothBlockingAndReactive() {
- manifests(Phase.CREATE, false, false);
+ KubernetesClientDiscoveryClientUtils.patchForBlockingAndReactive(DEPLOYMENT_NAME, NAMESPACE);
+ util.waitForDeploymentAfterPatch(DEPLOYMENT_NAME, NAMESPACE,
+ Map.of("app", "spring-cloud-kubernetes-client-discovery-it"));
String logs = logs();
Assertions.assertTrue(logs.contains("using selective namespaces : [a]"));
@@ -180,44 +189,101 @@ class KubernetesClientDiscoverySingleSelectiveNamespaceIT {
blockingCheck();
reactiveCheck();
- manifests(Phase.DELETE, false, false);
-
}
- private static void manifests(Phase phase, boolean disableBlocking, boolean disableReactive) {
+ /**
+ * previous test already has:
+ * - SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0 = a
+ * - SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED = TRUE
+ * - SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED = TRUE
+ *
+ * All we need to patch for is:
+ * - add one more namespace to track, via SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_1 = b
+ * - disable reactive, via SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED = FALSE
+ *
+ * As such, two namespaces + blocking only, is achieved.
+ *
+ */
+ @Test
+ @Order(4)
+ void testTwoNamespacesBlockingOnly() {
+ KubernetesClientDiscoveryClientUtils.patchForTwoNamespacesBlockingOnly(DEPLOYMENT_NAME, NAMESPACE);
+ util.waitForDeploymentAfterPatch(DEPLOYMENT_NAME, NAMESPACE,
+ Map.of("app", "spring-cloud-kubernetes-client-discovery-it"));
+ new KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate().testTwoNamespacesBlockingOnly(K3S);
+ }
+
+ /**
+ * previous test already has:
+ * - SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0 = a
+ * - SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_1 = b
+ * - SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED = FALSE
+ * - SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED = TRUE
+ *
+ * We invert the reactive and blocking in this test via patching.
+ *
+ * As such, two namespaces + reactive only, is achieved.
+ *
+ */
+ @Test
+ @Order(5)
+ void testTwoNamespacesReactiveOnly() {
+ KubernetesClientDiscoveryClientUtils.patchForReactiveOnly(DEPLOYMENT_NAME, NAMESPACE);
+ util.waitForDeploymentAfterPatch(DEPLOYMENT_NAME, NAMESPACE,
+ Map.of("app", "spring-cloud-kubernetes-client-discovery-it"));
+ new KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate().testTwoNamespaceReactiveOnly(K3S);
+ }
+
+ /**
+ * previous test already has:
+ * - SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0 = a
+ * - SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_1 = b
+ * - SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED = TRUE
+ * - SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED = FALSE
+ *
+ * We invert the blocking support.
+ *
+ * As such, two namespaces + blocking and reactive, is achieved.
+ *
+ */
+ @Test
+ @Order(6)
+ void testTwoNamespacesBothBlockingAndReactive() {
+ KubernetesClientDiscoveryClientUtils.patchToAddBlockingSupport(DEPLOYMENT_NAME, NAMESPACE);
+ util.waitForDeploymentAfterPatch(DEPLOYMENT_NAME, NAMESPACE,
+ Map.of("app", "spring-cloud-kubernetes-client-discovery-it"));
+ new KubernetesClientDiscoveryMultipleSelectiveNamespacesITDelegate()
+ .testTwoNamespacesBothBlockingAndReactive(K3S);
+ }
+
+ private static void manifests(Phase phase) {
V1Deployment deployment = (V1Deployment) util.yaml("kubernetes-discovery-deployment.yaml");
V1Service service = (V1Service) util.yaml("kubernetes-discovery-service.yaml");
V1Ingress ingress = (V1Ingress) util.yaml("kubernetes-discovery-ingress.yaml");
- List envVars = new ArrayList<>(
- Optional.ofNullable(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv())
- .orElse(List.of()));
- V1EnvVar debugLevel = new V1EnvVar().name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY")
- .value("DEBUG");
- V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0")
- .value(NAMESPACE_A);
- if (disableReactive) {
+ if (phase.equals(Phase.DELETE)) {
+ util.deleteAndWait(NAMESPACE, deployment, service, ingress);
+ return;
+ }
+
+ if (phase.equals(Phase.CREATE)) {
+ List envVars = new ArrayList<>(
+ Optional.ofNullable(deployment.getSpec().getTemplate().getSpec().getContainers().get(0).getEnv())
+ .orElse(List.of()));
+ V1EnvVar debugLevel = new V1EnvVar()
+ .name("LOGGING_LEVEL_ORG_SPRINGFRAMEWORK_CLOUD_KUBERNETES_CLIENT_DISCOVERY").value("DEBUG");
+ V1EnvVar selectiveNamespaceA = new V1EnvVar().name("SPRING_CLOUD_KUBERNETES_DISCOVERY_NAMESPACES_0")
+ .value(NAMESPACE_A);
+
V1EnvVar disableReactiveEnvVar = new V1EnvVar().name("SPRING_CLOUD_DISCOVERY_REACTIVE_ENABLED")
.value("FALSE");
envVars.add(disableReactiveEnvVar);
- }
- if (disableBlocking) {
- V1EnvVar disableBlockingEnvVar = new V1EnvVar().name("SPRING_CLOUD_DISCOVERY_BLOCKING_ENABLED")
- .value("FALSE");
- envVars.add(disableBlockingEnvVar);
- }
-
- envVars.add(debugLevel);
- envVars.add(selectiveNamespaceA);
- deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
-
- if (phase.equals(Phase.CREATE)) {
+ envVars.add(debugLevel);
+ envVars.add(selectiveNamespaceA);
+ deployment.getSpec().getTemplate().getSpec().getContainers().get(0).setEnv(envVars);
util.createAndWait(NAMESPACE, null, deployment, service, ingress, true);
}
- else if (phase.equals(Phase.DELETE)) {
- util.deleteAndWait(NAMESPACE, deployment, service, ingress);
- }
}
private void reactiveCheck() {
diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-deployment.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-deployment.yaml
index 3fe5f0a2..bb8eaa28 100644
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-deployment.yaml
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-discovery-it/src/test/resources/kubernetes-discovery-deployment.yaml
@@ -20,15 +20,15 @@ spec:
httpGet:
port: 8080
path: /actuator/health/readiness
- initialDelaySeconds: 10
+ initialDelaySeconds: 15
periodSeconds: 2
- failureThreshold: 3
+ failureThreshold: 5
livenessProbe:
httpGet:
port: 8080
path: /actuator/health/liveness
- initialDelaySeconds: 10
+ initialDelaySeconds: 15
periodSeconds: 2
- failureThreshold: 3
+ failureThreshold: 5
ports:
- containerPort: 8080
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
index 3fb9903b..dd737834 100644
--- 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
@@ -162,19 +162,6 @@ public final class Commons {
CONTAINER.execInContainer("crictl", "rmi", image);
}
- /**
- * 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);
- }
- }
-
/**
* validates that the provided image does exist in the local docker registry.
*/
diff --git a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java
index dbb0ebe8..e46aa618 100644
--- a/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java
+++ b/spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java
@@ -24,6 +24,7 @@ import java.net.HttpURLConnection;
import java.time.Duration;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@@ -135,10 +136,6 @@ public final class Util {
if (e instanceof ApiException apiException) {
System.out.println(apiException.getResponseBody());
}
- e.printStackTrace();
- LOG.info("events : " + events());
- LOG.info("describe deployment : " + describeDeployment(deployment));
- LOG.info("node events : " + nodeEvents());
throw new RuntimeException(e);
}
}
@@ -593,6 +590,46 @@ public final class Util {
return availableReplicas != null && availableReplicas >= 1;
}
+ public void waitForDeploymentAfterPatch(String deploymentName, String namespace, Map labels) {
+ try {
+ await().pollDelay(Duration.ofSeconds(4)).pollInterval(Duration.ofSeconds(3)).atMost(60, TimeUnit.SECONDS)
+ .until(() -> isDeploymentReadyAfterPatch(deploymentName, namespace, labels));
+ }
+ catch (Exception e) {
+ if (e instanceof ApiException apiException) {
+ LOG.error("Error: ");
+ LOG.error(apiException.getResponseBody());
+ }
+ throw new RuntimeException(e);
+ }
+
+ }
+
+ private boolean isDeploymentReadyAfterPatch(String deploymentName, String namespace, Map labels)
+ throws ApiException {
+
+ V1DeploymentList deployments = appsV1Api.listNamespacedDeployment(namespace, null, null, null,
+ "metadata.name=" + deploymentName, null, null, null, null, null, null);
+ if (deployments.getItems().size() < 1) {
+ fail("No deployment with name " + deploymentName);
+ }
+
+ V1Deployment deployment = deployments.getItems().get(0);
+ // if no replicas are defined, it means only 1 is needed
+ int replicas = Optional.ofNullable(deployment.getSpec().getReplicas()).orElse(1);
+
+ int numberOfPods = coreV1Api.listNamespacedPod(namespace, null, null, null, null, labelSelector(labels), null,
+ null, null, null, null).getItems().size();
+
+ if (numberOfPods != replicas) {
+ LOG.info("number of pods not yet stabilized");
+ return false;
+ }
+
+ return replicas == Optional.ofNullable(deployment.getStatus().getAvailableReplicas()).orElse(0);
+
+ }
+
private static void notExistsHandler(CheckedSupplier callee, CheckedSupplier defaulter) throws Exception {
try {
callee.get();
@@ -612,38 +649,6 @@ public final class Util {
return labels.entrySet().stream().map(en -> en.getKey() + "=" + en.getValue()).collect(Collectors.joining(","));
}
- private String events() {
- try {
- return container.execInContainer("sh", "-c", "kubectl get events").getStdout();
- }
- catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- private String nodeEvents() {
- try {
- String nodeName = container.execInContainer("sh", "-c", "kubectl get nodes --no-headers | awk '{print $1}'")
- .getStdout();
- LOG.info("nodeName : " + nodeName);
- return container.execInContainer("sh", "-c", "kubectl describe node " + nodeName).getStdout();
- }
- catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- private String describeDeployment(V1Deployment deployment) {
- try {
- return container
- .execInContainer("sh", "-c", "kubectl describe deployment " + deployment.getMetadata().getName())
- .getStdout();
- }
- catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
private interface CheckedSupplier {
T get() throws Exception;
diff --git a/spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-deployment.yaml b/spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-deployment.yaml
index 1799c71d..90e096cf 100644
--- a/spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-deployment.yaml
+++ b/spring-cloud-kubernetes-test-support/src/main/resources/wiremock/wiremock-deployment.yaml
@@ -20,9 +20,15 @@ spec:
httpGet:
port: 8080
path: /__admin/mappings
+ initialDelaySeconds: 3
+ periodSeconds: 2
+ failureThreshold: 1
livenessProbe:
httpGet:
port: 8080
path: /__admin/mappings
+ initialDelaySeconds: 3
+ periodSeconds: 2
+ failureThreshold: 1
ports:
- containerPort: 8080