dirty

Author: wind57

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/Fabric8DiscoveryController.java

@@ -53,6 +53,7 @@ List<Endpoints> getEndPointsList(@PathVariable("serviceId") String serviceId) {
 
 	@GetMapping("/service-instances/{serviceId}")
 	List<ServiceInstance> serviceInstances(@PathVariable("serviceId") String serviceId) {
+		discoveryClient.getServices();
 		return discoveryClient.getInstances(serviceId);
 	}
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/it/Fabric8DiscoveryBase.java

@@ -28,19 +28,20 @@
 import org.springframework.cloud.kubernetes.integration.tests.commons.fabric8_client.Util;
 import org.springframework.test.context.TestPropertySource;
 
+/**
+ * @author wind57
+ */
 @TestPropertySource(
 	properties = { "spring.main.cloud-platform=kubernetes", "spring.cloud.config.import-check.enabled=false",
 		"spring.cloud.kubernetes.client.namespace=default",
-		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=DEBUG" })
+		"spring.cloud.kubernetes.discovery.metadata.add-pod-labels=true",
+		"spring.cloud.kubernetes.discovery.metadata.add-pod-annotations=true" ,
+		"logging.level.org.springframework.cloud.kubernetes.fabric8.discovery=debug" })
 @ExtendWith(OutputCaptureExtension.class)
 abstract class Fabric8DiscoveryBase {
 
 	protected static final String NAMESPACE = "default";
 
-	protected static final String NAMESPACE_A = "a";
-
-	protected static final String NAMESPACE_B = "b";
-
 	protected static final K3sContainer K3S = Commons.container();
 
 	protected static Util util;

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/discovery/it/Fabric8DiscoveryPodMetadataIT.java

@@ -19,28 +19,33 @@
 import java.util.List;
 import java.util.Map;
 
+import io.fabric8.kubernetes.client.KubernetesClient;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.test.web.server.LocalServerPort;
 import org.springframework.cloud.kubernetes.commons.discovery.DefaultKubernetesServiceInstance;
 import org.springframework.cloud.kubernetes.fabric8.client.discovery.Fabric8DiscoveryApp;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
 import org.springframework.cloud.kubernetes.integration.tests.commons.Phase;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Primary;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpMethod;
 import org.springframework.web.reactive.function.client.WebClient;
 
 import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.TestAssertions.builder;
 import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.TestAssertions.retrySpec;
+import static org.springframework.cloud.kubernetes.fabric8.client.discovery.it.Fabric8DiscoveryPodMetadataIT.TestConfig;
 
 /**
  * @author wind57
  */
-@SpringBootTest(classes = { Fabric8DiscoveryApp.class },
+@SpringBootTest(classes = { Fabric8DiscoveryApp.class, TestConfig.class },
 	webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 class Fabric8DiscoveryPodMetadataIT extends Fabric8DiscoveryBase {
 
@@ -58,9 +63,16 @@ void afterEach() {
 		util.busybox(NAMESPACE, Phase.DELETE);
 	}
 
+	/**
+	 * <pre>
+	 * 		- there is a 'busybox-service' service deployed with two pods
+	 * 		- find each of the pod, add annotation to one and labels to another
+	 * 		- call
+	 * </pre>
+	 */
 	@Test
 	void test() throws Exception {
-// find both pods
+		// find both pods
 		String[] both = K3S.execInContainer("sh", "-c", "kubectl get pods -l app=busybox -o=name --no-headers")
 			.getStdout()
 			.split("\n");
@@ -70,45 +82,17 @@ void test() throws Exception {
 		// add annotation to the second pod
 		K3S.execInContainer("sh", "-c",
 			"kubectl annotate pods " + both[1].split("/")[1] + " custom-annotation=custom-annotation-value");
+	}
 
-		WebClient client = builder().baseUrl("http://localhost:" + port + "/busybox-service").build();
-		List<DefaultKubernetesServiceInstance> serviceInstances = client.method(HttpMethod.GET)
-			.retrieve()
-			.bodyToMono(new ParameterizedTypeReference<List<DefaultKubernetesServiceInstance>>() {
-
-			})
-			.retryWhen(retrySpec())
-			.block();
+	@TestConfiguration
+	static class TestConfig {
 
-		DefaultKubernetesServiceInstance withCustomLabel = serviceInstances.stream()
-			.filter(x -> x.podMetadata().getOrDefault("annotations", Map.of()).isEmpty())
-			.toList()
-			.get(0);
-		Assertions.assertEquals(withCustomLabel.getServiceId(), "busybox-service");
-		Assertions.assertNotNull(withCustomLabel.getInstanceId());
-		Assertions.assertNotNull(withCustomLabel.getHost());
-		Assertions.assertEquals(withCustomLabel.getMetadata(),
-			Map.of("k8s_namespace", "default", "type", "ClusterIP", "port.busybox-port", "80"));
-		Assertions.assertTrue(withCustomLabel.podMetadata()
-			.get("labels")
-			.entrySet()
-			.stream()
-			.anyMatch(x -> x.getKey().equals("custom-label") && x.getValue().equals("custom-label-value")));
+		@Bean
+		@Primary
+		KubernetesClient kubernetesClient() {
+			return client();
+		}
 
-		DefaultKubernetesServiceInstance withCustomAnnotation = serviceInstances.stream()
-			.filter(x -> !x.podMetadata().getOrDefault("annotations", Map.of()).isEmpty())
-			.toList()
-			.get(0);
-		Assertions.assertEquals(withCustomAnnotation.getServiceId(), "busybox-service");
-		Assertions.assertNotNull(withCustomAnnotation.getInstanceId());
-		Assertions.assertNotNull(withCustomAnnotation.getHost());
-		Assertions.assertEquals(withCustomAnnotation.getMetadata(),
-			Map.of("k8s_namespace", "default", "type", "ClusterIP", "port.busybox-port", "80"));
-		Assertions.assertTrue(withCustomAnnotation.podMetadata()
-			.get("annotations")
-			.entrySet()
-			.stream()
-			.anyMatch(x -> x.getKey().equals("custom-annotation") && x.getValue().equals("custom-annotation-value")));
 	}
 
 }