Adds Discovery Server and Discovery Client

pom.xml

@@ -110,6 +110,8 @@
 		<module>docs</module>
 		<module>spring-cloud-kubernetes-fabric8-loadbalancer</module>
 		<module>spring-cloud-starter-kubernetes-fabric8-loadbalancer</module>
+		<module>spring-cloud-kubernetes-discovery</module>
+		<module>spring-cloud-starter-kubernetes-discoveryclient</module>
 	</modules>
 
 	<dependencyManagement>

scripts/deploy.sh

@@ -3,4 +3,5 @@ set -e
 
 ./mvnw deploy -DskipTests -B -Pfast,deploy ${@}
 ./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configuration-watcher -Pdockerpush ${@}
+./mvnw dockerfile:push -pl :spring-cloud-kubernetes-discoveryserver -Pdockerpush ${@}
 ./mvnw dockerfile:push -pl :spring-cloud-kubernetes-configserver -Pdockerpush ${@}

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClient.java

@@ -163,7 +163,8 @@ public List<ServiceInstance> getInstances(String serviceId) {
 					return addresses.stream()
 							.map(addr -> new KubernetesServiceInstance(
 									addr.getTargetRef() != null ? addr.getTargetRef().getUid() : "", serviceId,
-									addr.getIp(), port, metadata, false));
+									addr.getIp(), port, metadata, false, service.getMetadata().getNamespace(),
+									service.getMetadata().getClusterName()));
 				}).collect(Collectors.toList());
 	}
 

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientTests.java

@@ -151,8 +151,8 @@ public void testDiscoveryInstancesWithServiceLabels() {
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
 		assertThat(discoveryClient.getInstances("test-svc-1").toArray()).isEmpty();
-		assertThat(discoveryClient.getInstances("test-svc-3").toArray())
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-3", "2.2.2.2", 8080, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-3").toArray()).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-3", "2.2.2.2", 8080, new HashMap<>(), false, "namespace1", null));
 	}
 
 	@Test
@@ -179,8 +179,8 @@ public void testDiscoveryGetInstanceAllNamespaceShouldWork() {
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false, "namespace1", null));
 
 		verify(kubernetesDiscoveryProperties, times(2)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
@@ -196,8 +196,8 @@ public void testDiscoveryGetInstanceOneNamespaceShouldWork() {
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 	}
@@ -229,8 +229,8 @@ public void testDiscoveryGetInstanceWithNotReadyAddressesIncludedShouldWork() {
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 		verify(kubernetesDiscoveryProperties, times(1)).isIncludeNotReadyAddresses();
@@ -275,8 +275,8 @@ public void instanceWithMultiplePortsAndPrimaryPortNameConfiguredWithLabelShould
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 443, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "1.1.1.1", 443, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 		verify(kubernetesDiscoveryProperties, times(1)).isIncludeNotReadyAddresses();
@@ -294,8 +294,8 @@ public void instanceWithMultiplePortsAndMisconfiguredPrimaryPortNameInLabelShoul
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 80, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "1.1.1.1", 80, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 	}
@@ -311,8 +311,8 @@ public void instanceWithMultiplePortsAndGenericPrimaryPortNameConfiguredShouldWo
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 443, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "1.1.1.1", 443, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).isIncludeNotReadyAddresses();
@@ -330,8 +330,8 @@ public void instanceWithMultiplePortsAndMisconfiguredGenericPrimaryPortNameShoul
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 80, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "1.1.1.1", 80, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 	}
@@ -346,8 +346,8 @@ public void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedShouldFal
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 443, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "1.1.1.1", 443, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 	}
@@ -362,8 +362,8 @@ public void instanceWithMultiplePortsAndWithoutPrimaryPortNameSpecifiedOrHttpsPo
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 80, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "1.1.1.1", 80, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 	}
@@ -379,8 +379,8 @@ public void instanceWithMultiplePortsAndWithoutAnyConfigurationShouldPickTheFirs
 		KubernetesInformerDiscoveryClient discoveryClient = new KubernetesInformerDiscoveryClient("namespace1",
 				sharedInformerFactory, serviceLister, endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		assertThat(discoveryClient.getInstances("test-svc-1"))
-				.containsOnly(new KubernetesServiceInstance("", "test-svc-1", "1.1.1.1", 80, new HashMap<>(), false));
+		assertThat(discoveryClient.getInstances("test-svc-1")).containsOnly(new KubernetesServiceInstance("",
+				"test-svc-1", "1.1.1.1", 80, new HashMap<>(), false, "namespace1", null));
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();
 		verify(kubernetesDiscoveryProperties, times(1)).getPrimaryPortName();
 	}

spring-cloud-kubernetes-client-discovery/src/test/java/org/springframework/cloud/kubernetes/client/discovery/reactive/KubernetesInformerReactiveDiscoveryClientTests.java

@@ -116,8 +116,9 @@ public void testDiscoveryGetInstanceAllNamespaceShouldWork() {
 				new KubernetesNamespaceProvider(new MockEnvironment()), sharedInformerFactory, serviceLister,
 				endpointsLister, null, null, kubernetesDiscoveryProperties);
 
-		StepVerifier.create(discoveryClient.getInstances("test-svc-1"))
-				.expectNext(new KubernetesServiceInstance("", "test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false))
+		StepVerifier
+				.create(discoveryClient.getInstances("test-svc-1")).expectNext(new KubernetesServiceInstance("",
+						"test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false, "namespace1", null))
 				.expectComplete().verify();
 
 		verify(kubernetesDiscoveryProperties, times(2)).isAllNamespaces();
@@ -135,8 +136,9 @@ public void testDiscoveryGetInstanceOneNamespaceShouldWork() {
 				kubernetesNamespaceProvider, sharedInformerFactory, serviceLister, endpointsLister, null, null,
 				kubernetesDiscoveryProperties);
 
-		StepVerifier.create(discoveryClient.getInstances("test-svc-1"))
-				.expectNext(new KubernetesServiceInstance("", "test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false))
+		StepVerifier
+				.create(discoveryClient.getInstances("test-svc-1")).expectNext(new KubernetesServiceInstance("",
+						"test-svc-1", "2.2.2.2", 8080, new HashMap<>(), false, "namespace1", null))
 				.expectComplete().verify();
 
 		verify(kubernetesDiscoveryProperties, times(1)).isAllNamespaces();

spring-cloud-kubernetes-commons/pom.xml

@@ -20,6 +20,10 @@
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-commons</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-logging</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-actuator-autoconfigure</artifactId>

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/KubernetesServiceInstance.java

@@ -37,19 +37,23 @@ public class KubernetesServiceInstance implements ServiceInstance {
 
 	private static final String COLON = ":";
 
-	private final String instanceId;
+	private String instanceId;
 
-	private final String serviceId;
+	private String serviceId;
 
-	private final String host;
+	private String host;
 
-	private final int port;
+	private int port;
 
-	private final URI uri;
+	private URI uri;
 
-	private final Boolean secure;
+	private Boolean secure;
 
-	private final Map<String, String> metadata;
+	private Map<String, String> metadata;
+
+	private String namespace;
+
+	private String cluster;
 
 	/**
 	 * @param instanceId the id of the instance.
@@ -68,6 +72,35 @@ public KubernetesServiceInstance(String instanceId, String serviceId, String hos
 		this.metadata = metadata;
 		this.secure = secure;
 		this.uri = createUri(secure ? HTTPS_PREFIX : HTTP_PREFIX, host, port);
+		this.namespace = null;
+		this.cluster = null;
+	}
+
+	/**
+	 * @param instanceId the id of the instance.
+	 * @param serviceId the id of the service.
+	 * @param host the address where the service instance can be found.
+	 * @param port the port on which the service is running.
+	 * @param metadata a map containing metadata.
+	 * @param secure indicates whether or not the connection needs to be secure.
+	 * @param namespace the namespace of the service.
+	 * @param cluster the clust the service resides in.
+	 */
+	public KubernetesServiceInstance(String instanceId, String serviceId, String host, int port,
+			Map<String, String> metadata, Boolean secure, String namespace, String cluster) {
+		this.instanceId = instanceId;
+		this.serviceId = serviceId;
+		this.host = host;
+		this.port = port;
+		this.metadata = metadata;
+		this.secure = secure;
+		this.uri = createUri(secure ? HTTPS_PREFIX : HTTP_PREFIX, host, port);
+		this.namespace = namespace;
+		this.cluster = cluster;
+	}
+
+	// Allows for deserialization
+	public KubernetesServiceInstance() {
 	}
 
 	@Override
@@ -114,7 +147,51 @@ private URI createUri(String scheme, String host, int port) {
 	}
 
 	public String getNamespace() {
-		return this.metadata != null ? this.metadata.get(NAMESPACE_METADATA_KEY) : null;
+		return namespace != null ? namespace : this.metadata.get(NAMESPACE_METADATA_KEY);
+	}
+
+	public String getCluster() {
+		return this.cluster;
+	}
+
+	public void setInstanceId(String instanceId) {
+		this.instanceId = instanceId;
+	}
+
+	public void setServiceId(String serviceId) {
+		this.serviceId = serviceId;
+	}
+
+	public void setHost(String host) {
+		this.host = host;
+	}
+
+	public void setPort(int port) {
+		this.port = port;
+	}
+
+	public void setUri(URI uri) {
+		this.uri = uri;
+	}
+
+	public void setSecure(Boolean secure) {
+		this.secure = secure;
+	}
+
+	public void setMetadata(Map<String, String> metadata) {
+		this.metadata = metadata;
+	}
+
+	public void setNamespace(String namespace) {
+		this.namespace = namespace;
+	}
+
+	public void setCluster(String cluster) {
+		this.cluster = cluster;
+	}
+
+	public Boolean getSecure() {
+		return secure;
 	}
 
 	@Override
@@ -129,19 +206,20 @@ public boolean equals(Object o) {
 		return port == that.port && Objects.equals(instanceId, that.instanceId)
 				&& Objects.equals(serviceId, that.serviceId) && Objects.equals(host, that.host)
 				&& Objects.equals(uri, that.uri) && Objects.equals(secure, that.secure)
-				&& Objects.equals(metadata, that.metadata);
+				&& Objects.equals(metadata, that.metadata) && Objects.equals(getNamespace(), that.getNamespace())
+				&& Objects.equals(cluster, that.cluster);
 	}
 
 	@Override
 	public String toString() {
 		return "KubernetesServiceInstance{" + "instanceId='" + instanceId + '\'' + ", serviceId='" + serviceId + '\''
-				+ ", host='" + host + '\'' + ", port=" + port + ", uri=" + uri + ", secure=" + secure + ", metadata="
-				+ metadata + '}';
+				+ ", host='" + host + '\'' + ", port=" + port + ", uri=" + uri + ", secure=" + secure + ", namespace="
+				+ getNamespace() + ", cluster=" + cluster + ", metadata=" + metadata + '}';
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(instanceId, serviceId, host, port, uri, secure, metadata);
+		return Objects.hash(instanceId, serviceId, host, port, uri, secure, getNamespace(), cluster, metadata);
 	}
 
 }

spring-cloud-kubernetes-controllers/pom.xml

@@ -14,6 +14,7 @@
 
 	<modules>
 		<module>spring-cloud-kubernetes-configuration-watcher</module>
+		<module>spring-cloud-kubernetes-discoveryserver</module>
 		<module>spring-cloud-kubernetes-configserver</module>
 	</modules>