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

Fix missing imports

Browse Source
This commit is contained in:
Ryan Baxter
2023-06-16 09:16:21 -04:00
parent ab1bf742d5
commit e4b47438f7
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapper.java
View File

@@ -78,7 +78,8 @@ class Fabric8ConfigServerBootstrapper extends KubernetesConfigServerBootstrapper
KubernetesDiscoveryProperties discoveryProperties = createKubernetesDiscoveryProperties(binder,
bindHandler);
KubernetesClientProperties clientProperties = createKubernetesClientProperties(binder, bindHandler);
return getInstanceProvider(discoveryProperties, clientProperties, context, binder, bindHandler).getInstances(serviceId);
return getInstanceProvider(discoveryProperties, clientProperties, context, binder, bindHandler)
.getInstances(serviceId);
}
private KubernetesConfigServerInstanceProvider getInstanceProvider(
@@ -93,9 +94,9 @@ class Fabric8ConfigServerBootstrapper extends KubernetesConfigServerBootstrapper
Config config = fabric8AutoConfiguration.kubernetesClientConfig(clientProperties);
KubernetesClient kubernetesClient = fabric8AutoConfiguration.kubernetesClient(config);
KubernetesDiscoveryClient discoveryClient = new KubernetesDiscoveryClient(kubernetesClient,
discoveryProperties,
KubernetesClientServicesFunctionProvider.servicesFunction(discoveryProperties, binder, bindHandler), null,
new ServicePortSecureResolver(discoveryProperties));
discoveryProperties, KubernetesClientServicesFunctionProvider
.servicesFunction(discoveryProperties, binder, bindHandler),
null, new ServicePortSecureResolver(discoveryProperties));
return discoveryClient::getInstances;
}
}

14
spring-cloud-kubernetes-fabric8-discovery/src/test/java/org/springframework/cloud/kubernetes/fabric8/discovery/Fabric8ConfigServerBootstrapperTests.java
View File

@@ -16,6 +16,18 @@
package org.springframework.cloud.kubernetes.fabric8.discovery;
import java.util.Arrays;
import java.util.HashMap;
import java.util.LinkedHashSet;
import java.util.Map;
import java.util.Set;
import com.github.tomakehurst.wiremock.WireMockServer;
import com.github.tomakehurst.wiremock.client.WireMock;
import io.fabric8.kubernetes.api.model.Endpoints;
import io.fabric8.kubernetes.api.model.EndpointsBuilder;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceSpecBuilder;
import io.fabric8.kubernetes.client.Config;
import io.fabric8.kubernetes.client.KubernetesClient;
@@ -23,6 +35,8 @@ import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import wiremock.com.fasterxml.jackson.core.JsonProcessingException;
import wiremock.com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.boot.SpringBootConfiguration;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;