Merge branch '3.0.x'

Author: ryanjbaxter

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

@@ -59,41 +59,41 @@ private DiscoveryClientUtils() {
 	 *     - service type
 	 * </pre>
 	 */
-	public static Map<String, String> serviceMetadata(String serviceId, Map<String, String> serviceLabels,
-			Map<String, String> serviceAnnotations, Map<String, String> portsData,
-			KubernetesDiscoveryProperties properties, String namespace, String serviceType) {
-		Map<String, String> serviceMetadata = new HashMap<>();
+	public static Map<String, String> serviceInstanceMetadata(Map<String, String> portsData,
+			ServiceMetadata serviceMetadata, KubernetesDiscoveryProperties properties) {
+		Map<String, String> result = new HashMap<>();
 		KubernetesDiscoveryProperties.Metadata metadataProps = properties.metadata();
 		if (metadataProps.addLabels()) {
-			Map<String, String> labelMetadata = keysWithPrefix(serviceLabels, metadataProps.labelsPrefix());
-			LOG.debug(() -> "Adding labels metadata: " + labelMetadata + " for serviceId: " + serviceId);
-			serviceMetadata.putAll(labelMetadata);
+			Map<String, String> labelMetadata = keysWithPrefix(serviceMetadata.labels(), metadataProps.labelsPrefix());
+			LOG.debug(() -> "Adding labels metadata: " + labelMetadata + " for serviceId: " + serviceMetadata.name());
+			result.putAll(labelMetadata);
 		}
 		if (metadataProps.addAnnotations()) {
-			Map<String, String> annotationMetadata = keysWithPrefix(serviceAnnotations,
+			Map<String, String> annotationMetadata = keysWithPrefix(serviceMetadata.annotations(),
 					metadataProps.annotationsPrefix());
-			LOG.debug(() -> "Adding annotations metadata: " + annotationMetadata + " for serviceId: " + serviceId);
-			serviceMetadata.putAll(annotationMetadata);
+			LOG.debug(() -> "Adding annotations metadata: " + annotationMetadata + " for serviceId: "
+					+ serviceMetadata.name());
+			result.putAll(annotationMetadata);
 		}
 
 		if (metadataProps.addPorts()) {
 			Map<String, String> portMetadata = keysWithPrefix(portsData, properties.metadata().portsPrefix());
 			if (!portMetadata.isEmpty()) {
-				LOG.debug(() -> "Adding port metadata: " + portMetadata + " for serviceId : " + serviceId);
+				LOG.debug(() -> "Adding port metadata: " + portMetadata + " for serviceId : " + serviceMetadata.name());
 			}
-			serviceMetadata.putAll(portMetadata);
+			result.putAll(portMetadata);
 		}
 
-		serviceMetadata.put(NAMESPACE_METADATA_KEY, namespace);
-		serviceMetadata.put(SERVICE_TYPE, serviceType);
-		return serviceMetadata;
+		result.put(NAMESPACE_METADATA_KEY, serviceMetadata.namespace());
+		result.put(SERVICE_TYPE, serviceMetadata.type());
+		return result;
 	}
 
 	public static ServicePortNameAndNumber endpointsPort(LinkedHashMap<String, Integer> endpointsPorts,
-			String serviceId, KubernetesDiscoveryProperties properties, Map<String, String> serviceLabels) {
+			ServiceMetadata serviceMetadata, KubernetesDiscoveryProperties properties) {
 
 		if (endpointsPorts.size() == 0) {
-			LOG.debug(() -> "no ports found for service : " + serviceId + ", will return zero");
+			LOG.debug(() -> "no ports found for service : " + serviceMetadata.name() + ", will return zero");
 			return new ServicePortNameAndNumber(0, "http");
 		}
 
@@ -106,7 +106,7 @@ public static ServicePortNameAndNumber endpointsPort(LinkedHashMap<String, Integ
 		else {
 
 			Optional<ServicePortNameAndNumber> portData;
-			String primaryPortName = primaryPortName(properties, serviceLabels, serviceId);
+			String primaryPortName = primaryPortName(properties, serviceMetadata.labels(), serviceMetadata.name());
 
 			Map<String, Integer> existingPorts = endpointsPorts.entrySet().stream()
 					.filter(entry -> StringUtils.hasText(entry.getKey()))
@@ -136,11 +136,9 @@ public static ServicePortNameAndNumber endpointsPort(LinkedHashMap<String, Integ
 	}
 
 	public static ServiceInstance serviceInstance(@Nullable ServicePortSecureResolver servicePortSecureResolver,
-			ServiceMetadataForServiceInstance serviceMetadataForServiceInstance,
-			Supplier<InstanceIdHostPodName> instanceIdAndHost,
+			ServiceMetadata serviceMetadata, Supplier<InstanceIdHostPodName> instanceIdAndHost,
 			Function<String, PodLabelsAndAnnotations> podLabelsAndMetadata, ServicePortNameAndNumber portData,
-			String serviceId, Map<String, String> serviceMetadata, String namespace,
-			KubernetesDiscoveryProperties properties) {
+			Map<String, String> serviceInstanceMetadata, KubernetesDiscoveryProperties properties) {
 
 		InstanceIdHostPodName data = instanceIdAndHost.get();
 
@@ -150,15 +148,15 @@ public static ServiceInstance serviceInstance(@Nullable ServicePortSecureResolve
 		}
 		else {
 			secured = servicePortSecureResolver.resolve(new ServicePortSecureResolver.Input(portData,
-					serviceMetadataForServiceInstance.name(), serviceMetadataForServiceInstance.labels(),
-					serviceMetadataForServiceInstance.annotations()));
+					serviceMetadata.name(), serviceMetadata.labels(), serviceMetadata.annotations()));
 		}
 
-		Map<String, Map<String, String>> podMetadata = podMetadata(data.podName(), serviceMetadata, properties,
-				podLabelsAndMetadata);
+		Map<String, Map<String, String>> podMetadata = podMetadata(data.podName(), serviceInstanceMetadata,
+			properties, podLabelsAndMetadata);
 
-		return new DefaultKubernetesServiceInstance(data.instanceId(), serviceId, data.host(), portData.portNumber(),
-				serviceMetadata, secured, namespace, null, podMetadata);
+		return new DefaultKubernetesServiceInstance(data.instanceId(), serviceMetadata.name(),
+			data.host(), portData.portNumber(), serviceInstanceMetadata, secured,
+			serviceMetadata.namespace(), null, podMetadata);
 	}
 
 	/**

…y/ServiceMetadataForServiceInstance.java …s/commons/discovery/ServiceMetadata.javaspring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ServiceMetadataForServiceInstance.java renamed to spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ServiceMetadata.java spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ServiceMetadataForServiceInstance.java renamed to spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/ServiceMetadata.java

@@ -19,11 +19,11 @@
 import java.util.Map;
 
 /**
- * Holds service name, labels and annotations.
+ * Holds service name, namespace, spec.type, labels and annotations.
  *
  * @author wind57
  *
  */
-public record ServiceMetadataForServiceInstance(String name, Map<String, String> labels,
+public record ServiceMetadata(String name, String namespace, String type, Map<String, String> labels,
 		Map<String, String> annotations) {
 }