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,7 +53,6 @@ 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/Fabric8DiscoveryPodMetadataIT.java

@@ -67,21 +67,20 @@ void afterEach() {
 	 * <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
+	 * 		- call DiscoveryClient::getInstances with this serviceId and assert fields returned
 	 * </pre>
 	 */
 	@Test
 	void test() throws Exception {
-		// find both pods
-		String[] both = K3S.execInContainer("sh", "-c", "kubectl get pods -l app=busybox -o=name --no-headers")
+		String[] busyboxPods = K3S.execInContainer("sh", "-c", "kubectl get pods -l app=busybox -o=name --no-headers")
 			.getStdout()
 			.split("\n");
-		// add a label to first pod
-		K3S.execInContainer("sh", "-c",
-			"kubectl label pods " + both[0].split("/")[1] + " custom-label=custom-label-value");
-		// add annotation to the second pod
-		K3S.execInContainer("sh", "-c",
-			"kubectl annotate pods " + both[1].split("/")[1] + " custom-annotation=custom-annotation-value");
+
+		String podOne = busyboxPods[0].split("/")[1];
+		String podTwo = busyboxPods[1].split("/")[1];
+
+		K3S.execInContainer("sh", "-c", "kubectl label pods " + podOne + " my-label=my-value");
+		K3S.execInContainer("sh", "-c", "kubectl annotate pods " + podTwo + " my-annotation=my-value");
 	}
 
 	@TestConfiguration

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

@@ -19,6 +19,7 @@
 import java.time.Duration;
 import java.util.Objects;
 
+import org.springframework.cloud.client.discovery.DiscoveryClient;
 import reactor.netty.http.client.HttpClient;
 import reactor.util.retry.Retry;
 import reactor.util.retry.RetryBackoffSpec;
@@ -31,6 +32,10 @@
  */
 class TestAssertions {
 
+	static void assertPodMetadata(DiscoveryClient discoveryClient) {
+
+	}
+
 	static WebClient.Builder builder() {
 		return WebClient.builder().clientConnector(new ReactorClientHttpConnector(HttpClient.create()));
 	}