Skip to content

Commit b40050c

Browse files
committed
fix tests
Signed-off-by: wind57 <[email protected]>
1 parent 7f040f5 commit b40050c

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesInformerDiscoveryClientAutoConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,13 @@
3232
import org.springframework.cloud.kubernetes.client.KubernetesClientAutoConfiguration;
3333
import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
3434
import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
35+
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration;
3536
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
3637
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
3738
import org.springframework.context.annotation.Bean;
3839
import org.springframework.context.annotation.Conditional;
3940
import org.springframework.context.annotation.Configuration;
41+
import org.springframework.context.annotation.Import;
4042

4143
/**
4244
* @author wind57
@@ -47,6 +49,7 @@
4749
@AutoConfigureAfter({ KubernetesClientAutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class,
4850
KubernetesClientInformerAutoConfiguration.class,
4951
KubernetesClientInformerSelectiveNamespacesAutoConfiguration.class })
52+
@Import(KubernetesDiscoveryClientHealthConfiguration.class)
5053
public class KubernetesInformerDiscoveryClientAutoConfiguration {
5154

5255
@Deprecated(forRemoval = true)

spring-cloud-kubernetes-fabric8-discovery/src/main/java/org/springframework/cloud/kubernetes/fabric8/discovery/KubernetesDiscoveryClientAutoConfiguration.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,14 @@
2424
import org.springframework.cloud.client.CommonsClientAutoConfiguration;
2525
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
2626
import org.springframework.cloud.kubernetes.commons.discovery.ConditionalOnSpringCloudKubernetesBlockingDiscovery;
27+
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryClientHealthConfiguration;
2728
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
2829
import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryPropertiesAutoConfiguration;
2930
import org.springframework.cloud.kubernetes.commons.discovery.ServicePortSecureResolver;
3031
import org.springframework.cloud.kubernetes.fabric8.Fabric8AutoConfiguration;
3132
import org.springframework.context.annotation.Bean;
3233
import org.springframework.context.annotation.Configuration;
34+
import org.springframework.context.annotation.Import;
3335
import org.springframework.core.env.Environment;
3436

3537
/**
@@ -42,6 +44,7 @@
4244
@ConditionalOnSpringCloudKubernetesBlockingDiscovery
4345
@AutoConfigureBefore({ SimpleDiscoveryClientAutoConfiguration.class, CommonsClientAutoConfiguration.class })
4446
@AutoConfigureAfter({ Fabric8AutoConfiguration.class, KubernetesDiscoveryPropertiesAutoConfiguration.class })
47+
@Import(KubernetesDiscoveryClientHealthConfiguration.class)
4548
public class KubernetesDiscoveryClientAutoConfiguration {
4649

4750
@Bean

0 commit comments

Comments
 (0)