SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor renames and comments (#1392)

Browse Source
This commit is contained in:
erabii
2023-08-01 23:20:48 +03:00
committed by GitHub
parent 10edd1076a
commit 504fe36422
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8KubernetesDiscoveryClientUtils.java
View File

@@ -222,26 +222,31 @@ final class Fabric8KubernetesDiscoveryClientUtils {
// see https://github.com/spring-cloud/spring-cloud-kubernetes/issues/1182 on why this
// is needed
static List<Endpoints> withFilter(List<Endpoints> initial, KubernetesDiscoveryProperties properties,
static List<Endpoints> withFilter(List<Endpoints> endpoints, KubernetesDiscoveryProperties properties,
KubernetesClient client, Predicate<Service> filter) {
if (properties.filter() == null || properties.filter().isBlank()) {
LOG.debug(() -> "filter not present");
return initial;
return endpoints;
}
List<Endpoints> result = new ArrayList<>();
// group by namespace in order to make a single API call per namespace when
// retrieving services
Map<String, List<Endpoints>> byNamespace = initial.stream()
Map<String, List<Endpoints>> endpointsByNamespace = endpoints.stream()
.collect(Collectors.groupingBy(x -> x.getMetadata().getNamespace()));
for (Map.Entry<String, List<Endpoints>> entry : byNamespace.entrySet()) {
Set<String> withFilter = client.services().inNamespace(entry.getKey()).list().getItems().stream()
for (Map.Entry<String, List<Endpoints>> entry : endpointsByNamespace.entrySet()) {
// get all services in the namespace that match the filter
Set<String> filteredServiceNames = client.services().inNamespace(entry.getKey()).list().getItems().stream()
.filter(filter).map(service -> service.getMetadata().getName()).collect(Collectors.toSet());
result.addAll(
entry.getValue().stream().filter(x -> withFilter.contains(x.getMetadata().getName())).toList());
// in the previous step we might have taken "too many" services, so in the
// next one take only those that have a matching endpoints, by name.
// This way we only get the endpoints that have a matching service with an
// applied filter, it's like we filtered endpoints by that filter.
result.addAll(entry.getValue().stream()
.filter(endpoint -> filteredServiceNames.contains(endpoint.getMetadata().getName())).toList());
}

1
spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClient.java
View File

@@ -109,6 +109,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient, EnvironmentAw
List<ServiceInstance> instances = new ArrayList<>();
for (EndpointSubsetNS es : subsetsNS) {
// subsetsNS are only those that matched the serviceId
instances.addAll(getNamespaceServiceInstances(es, serviceId));
}