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

Merge branch '3.0.x'

Browse Source
This commit is contained in:
Ryan Baxter
2023-11-29 17:09:18 -05:00
parent 473aa52df4 70d85f6585
commit 315a9e2105
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -34,12 +34,15 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
private final KubernetesDiscoveryClientProperties properties;
private final boolean emptyNamespaces;
public KubernetesDiscoveryClient(RestTemplate rest, KubernetesDiscoveryClientProperties properties) {
if (!StringUtils.hasText(properties.getDiscoveryServerUrl())) {
throw new DiscoveryServerUrlInvalidException();
}
this.rest = rest;
this.properties = properties;
this.emptyNamespaces = properties.getNamespaces().isEmpty();
}
@Override
@@ -68,10 +71,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
}
private boolean matchNamespaces(KubernetesServiceInstance kubernetesServiceInstance) {
if (properties.getNamespaces().isEmpty()) {
return true;
}
return properties.getNamespaces().contains(kubernetesServiceInstance.getNamespace());
return emptyNamespaces || properties.getNamespaces().contains(kubernetesServiceInstance.getNamespace());
}
private boolean matchNamespaces(Service service) {