Merge pull request #2124 from wind57/minor-improvement-to-compute-service-metadata-only-once

compute kubernetes service metadata only once

Author: ryanjbaxter

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

@@ -180,21 +180,22 @@ private List<ServiceInstance> serviceInstances(V1Service service, String service
 			.filter(Objects::nonNull)
 			.toList();
 
+		ServiceMetadata k8sServiceMetadata = serviceMetadata(service);
+
 		for (V1Endpoints endpoints : allEndpoints) {
 			List<V1EndpointSubset> subsets = endpoints.getSubsets();
 			if (subsets == null || subsets.isEmpty()) {
 				LOG.debug(() -> "serviceId : " + serviceId + " does not have any subsets");
 			}
 			else {
-				ServiceMetadata serviceMetadata = serviceMetadata(service);
 				Map<String, Integer> portsData = endpointSubsetsPortData(subsets);
-				Map<String, String> serviceInstanceMetadata = serviceInstanceMetadata(portsData, serviceMetadata,
+				Map<String, String> serviceInstanceMetadata = serviceInstanceMetadata(portsData, k8sServiceMetadata,
 						properties);
 
 				for (V1EndpointSubset endpointSubset : subsets) {
 
 					Map<String, Integer> endpointsPortData = endpointSubsetsPortData(List.of(endpointSubset));
-					ServicePortNameAndNumber portData = endpointsPort(endpointsPortData, serviceMetadata, properties);
+					ServicePortNameAndNumber portData = endpointsPort(endpointsPortData, k8sServiceMetadata, properties);
 
 					List<V1EndpointAddress> addresses = addresses(endpointSubset, properties);
 					for (V1EndpointAddress endpointAddress : addresses) {
@@ -204,7 +205,7 @@ private List<ServiceInstance> serviceInstances(V1Service service, String service
 						KubernetesClientPodLabelsAndAnnotationsSupplier supplierTwo = nonExternalName(coreV1Api,
 								service.getMetadata().getNamespace());
 
-						ServiceInstance serviceInstance = serviceInstance(servicePortSecureResolver, serviceMetadata,
+						ServiceInstance serviceInstance = serviceInstance(servicePortSecureResolver, k8sServiceMetadata,
 								supplierOne, supplierTwo, portData, serviceInstanceMetadata, properties);
 						instances.add(serviceInstance);
 					}

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

@@ -247,7 +247,9 @@ void instanceWithoutSubsetsShouldBeSkipped() {
 			.build();
 		endpointsCache.add(endpoints);
 
-		V1Service service = new V1ServiceBuilder().withNewMetadata()
+		V1Service service = new V1ServiceBuilder()
+			.withSpec(new V1ServiceSpecBuilder().withType("ClusterIP").build())
+			.withNewMetadata()
 			.withName("endpoint1")
 			.withNamespace("test")
 			.and()