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

renaming kubernetes discovery properties parameter (#226)

Browse Source
This commit is contained in:
Paolo
2018-08-27 13:19:51 +02:00
committed by Ryan Baxter
parent 933474874b
commit e4ab0f7b0d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
public KubernetesDiscoveryClient(KubernetesClient client,
KubernetesDiscoveryProperties kubernetesDiscoveryProperties) {
this.client = client;
this.properties = properties;
this.properties = kubernetesDiscoveryProperties;
}
public KubernetesClient getClient() {
@@ -86,12 +86,12 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
List<EndpointSubset> subsets = endpoints.getSubsets();
if (subsets != null) {
for (EndpointSubset s : subsets) {
List<EndpointAddress> addresses = s.getAddresses();
for (EndpointAddress a : addresses) {
for (EndpointSubset subset : subsets) {
List<EndpointAddress> addresses = subset.getAddresses();
for (EndpointAddress address : addresses) {
return new KubernetesServiceInstance(serviceName,
a,
s.getPorts().stream().findFirst().orElseThrow(IllegalStateException::new),
address,
subset.getPorts().stream().findFirst().orElseThrow(IllegalStateException::new),
labels,
false);
}
@@ -120,12 +120,12 @@ public class KubernetesDiscoveryClient implements DiscoveryClient {
List<EndpointSubset> subsets = endpoints.get().getSubsets();
List<ServiceInstance> instances = new ArrayList<>();
if (subsets != null) {
for (EndpointSubset s : subsets) {
List<EndpointAddress> addresses = s.getAddresses();
for (EndpointAddress a : addresses) {
for (EndpointSubset subset : subsets) {
List<EndpointAddress> addresses = subset.getAddresses();
for (EndpointAddress address : addresses) {
instances.add(new KubernetesServiceInstance(serviceId,
a,
s.getPorts().stream().findFirst().orElseThrow(IllegalStateException::new),
address,
subset.getPorts().stream().findFirst().orElseThrow(IllegalStateException::new),
labels,
false));
}