fix

Signed-off-by: wind57 <[email protected]>

Author: wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/pom.xml

@@ -11,6 +11,11 @@
 
 	<artifactId>spring-cloud-kubernetes-k8s-client-discovery-server</artifactId>
 
+	<properties>
+		<spring-boot.repackage.skip>true</spring-boot.repackage.skip>
+		<spring-boot.build-image.skip>true</spring-boot.build-image.skip>
+	</properties>
+
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
@@ -43,10 +48,6 @@
 				<directory>../src/main/resources</directory>
 				<filtering>true</filtering>
 			</resource>
-			<resource>
-				<directory>src/main/resources</directory>
-				<filtering>true</filtering>
-			</resource>
 		</resources>
 	</build>
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/main/java/org/springframework/cloud/kubernetes/discoveryclient/it/App.java

@@ -18,11 +18,13 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 /**
  * @author wind57
  */
 @SpringBootApplication
+@EnableScheduling
 public class App {
 
 	public static void main(String[] args) {

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/main/java/org/springframework/cloud/kubernetes/discoveryclient/it/HeartbeatListener.java

@@ -40,7 +40,7 @@ class HeartbeatListener implements ApplicationListener<HeartbeatEvent> {
 	@Override
 	@SuppressWarnings("unchecked")
 	public void onApplicationEvent(HeartbeatEvent event) {
-		LOG.info("received heartbeat event");
+		LOG.info("received heartbeat event in listener");
 		List<EndpointNameAndNamespace> state = (List<EndpointNameAndNamespace>) event.getValue();
 		this.state.set(state);
 		LOG.info("state received : " + state);

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-discovery-server/src/main/resources/application.yaml

@@ -18,10 +18,10 @@
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.util.LinkedHashMap;
+import java.time.Duration;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.TimeUnit;
 
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.apis.CoreV1Api;
@@ -30,16 +30,14 @@
 import io.kubernetes.client.openapi.models.V1Deployment;
 import io.kubernetes.client.openapi.models.V1Service;
 import io.kubernetes.client.util.Config;
-import org.assertj.core.api.Assertions;
-import org.assertj.core.api.Condition;
+import org.awaitility.Awaitility;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.boot.test.system.CapturedOutput;
-import org.springframework.http.HttpMethod;
-import org.springframework.web.reactive.function.client.WebClient;
 import org.testcontainers.k3s.K3sContainer;
 
+import org.springframework.boot.test.system.CapturedOutput;
 import org.springframework.boot.test.system.OutputCaptureExtension;
+import org.springframework.cloud.kubernetes.commons.discovery.EndpointNameAndNamespace;
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Commons;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
@@ -112,52 +110,41 @@ protected static void serviceAccount(Phase phase) {
 				rbacApi.createClusterRoleBinding(clusterRoleBinding, null, null, null, null);
 			}
 			else {
-				rbacApi.deleteClusterRoleBinding(clusterRoleBinding.getMetadata().getName(),
-					null, null, null, null, null, null);
+				rbacApi.deleteClusterRoleBinding(clusterRoleBinding.getMetadata().getName(), null, null, null, null,
+						null, null);
 			}
 		}
-		catch(Exception e) {
+		catch (Exception e) {
 			throw new RuntimeException(e);
 		}
 
 	}
 
-	protected static void testHeartBeat(K3sContainer container,
-										HeartbeatListener heartbeatListener, CapturedOutput output) {
+	protected static void testHeartBeat(HeartbeatListener heartbeatListener, CapturedOutput output) {
 
 		// 1. logs from discovery server
-		Commons.waitForLogStatement("using delay : 3000", container, DISCOVERY_SERVER_LABEL);
-		Commons.waitForLogStatement("received heartbeat event", container, DISCOVERY_SERVER_LABEL);
-		Commons.waitForLogStatement("state received :", container, DISCOVERY_SERVER_LABEL);
+		Commons.waitForLogStatement("using delay : 3000", K3S, DISCOVERY_SERVER_LABEL);
+		Commons.waitForLogStatement("received heartbeat event", K3S, DISCOVERY_SERVER_LABEL);
+		Commons.waitForLogStatement("state received :", K3S, DISCOVERY_SERVER_LABEL);
 
 		// 2. logs from discovery client
 		assertThat(output.getOut()).contains("using delay : 3000");
 		assertThat(output.getOut()).contains("state received : ");
+		assertThat(output.getOut()).contains("received heartbeat event in listener");
+
+		// 3. heartbeat listener message
+		List<EndpointNameAndNamespace> result = heartbeatListener.state.get();
+		Awaitility.await()
+			.atMost(Duration.ofSeconds(60))
+			.pollInterval(Duration.ofSeconds(1))
+			.until(() -> result.size() == 2);
+
+		List<String> namespaces = result.stream().map(EndpointNameAndNamespace::namespace).toList();
+		assertThat(namespaces).containsExactlyInAnyOrder(NAMESPACE_LEFT, NAMESPACE_RIGHT);
 
-//		// 3. heartbeat listener message
-//		WebClient.Builder builder = builder();
-//		WebClient client = builder.baseUrl("http://localhost:80/discoveryclient-it/state").build();
-//		String result = client.method(HttpMethod.GET)
-//			.retrieve()
-//			.bodyToMono(String.class)
-//			.retryWhen(retrySpec())
-//			.block();
-//
-//		Condition<LinkedHashMap<String, String>> wireMockService = new Condition<>(
-//			map -> map.entrySet().stream().anyMatch(en -> en.getValue().contains("service-wiremock-deployment")),
-//			"");
-//
-//		Condition<LinkedHashMap<String, String>> discoveryServerService = new Condition<>(map -> map.entrySet()
-//			.stream()
-//			.anyMatch(en -> en.getValue().contains("spring-cloud-kubernetes-k8s-client-discovery-server")), "");
-//
-//		Assertions.assertThat(BASIC_JSON_TESTER.from(result))
-//			.<LinkedHashMap<String, String>>extractingJsonPathArrayValue("$.[*]")
-//			.areAtLeastOne(wireMockService);
-//
-//		Assertions.assertThat(BASIC_JSON_TESTER.from(result))
-//			.<LinkedHashMap<String, String>>extractingJsonPathArrayValue("$.[*]")
-//			.areAtLeastOne(discoveryServerService);
+		List<String> endpointNames = result.stream().map(EndpointNameAndNamespace::endpointName).toList();
+		assertThat(endpointNames.get(0)).contains("service-wiremock-deployment");
+		assertThat(endpointNames.get(1)).contains("service-wiremock-deployment");
 	}
 
 }