From 6885334ba57d2d3aba98785e6cdf6b4ea613cd3d Mon Sep 17 00:00:00 2001 From: Ioannis Canellos Date: Tue, 5 Apr 2016 12:47:49 +0300 Subject: [PATCH] Fix the way that KubernetesDiscoveryProperties are handled. --- .../discovery/KubernetesDiscoveryClientConfiguration.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientConfiguration.java b/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientConfiguration.java index ad81a243..d9ac8591 100644 --- a/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientConfiguration.java +++ b/spring-cloud-kubernetes-discovery/src/main/java/io/fabric8/spring/cloud/discovery/KubernetesDiscoveryClientConfiguration.java @@ -19,18 +19,15 @@ package io.fabric8.spring.cloud.discovery; import io.fabric8.kubernetes.client.KubernetesClient; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration +@EnableConfigurationProperties(KubernetesDiscoveryProperties.class) @ConditionalOnProperty(value = "spring.cloud.kubernetes.discovery.enabled", matchIfMissing = true) public class KubernetesDiscoveryClientConfiguration { - @Bean - public KubernetesDiscoveryProperties kubernetesDiscoveryProperties() { - return new KubernetesDiscoveryProperties(); - } - @Bean @ConditionalOnMissingBean public KubernetesDiscoveryClient kubernetesDiscoveryClient(KubernetesClient client, KubernetesDiscoveryProperties properties) {