Merge branch '3.0.x'

This commit is contained in:
Ryan Baxter
2023-11-29 11:03:54 -05:00

View File

@@ -77,7 +77,8 @@ class ConfigServerBootstrapper extends KubernetesConfigServerBootstrapper {
.bind(KubernetesDiscoveryProperties.PREFIX, Bindable.of(KubernetesDiscoveryClientProperties.class),
bindHandler)
.orElseGet(KubernetesDiscoveryClientProperties::new);
KubernetesDiscoveryClientAutoConfiguration.Servlet autoConfiguration = new KubernetesDiscoveryClientAutoConfiguration.Servlet();
KubernetesDiscoveryClientBlockingAutoConfiguration autoConfiguration =
new KubernetesDiscoveryClientBlockingAutoConfiguration();
DiscoveryClient discoveryClient = autoConfiguration
.kubernetesDiscoveryClient(autoConfiguration.restTemplate(), kubernetesDiscoveryClientProperties);
return discoveryClient::getInstances;