/*
 *   Copyright (C) 2016 to the original authors.
 *
 *   Licensed under the Apache License, Version 2.0 (the "License");
 *   you may not use this file except in compliance with the License.
 *   You may obtain a copy of the License at
 *
 *           http://www.apache.org/licenses/LICENSE-2.0
 *
 *   Unless required by applicable law or agreed to in writing, software
 *   distributed under the License is distributed on an "AS IS" BASIS,
 *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 */

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.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

@Configuration
@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) {
        return new KubernetesDiscoveryClient(client, properties.getServiceName());
    }

    @Bean
    public KubernetesDiscoveryLifecycle kubernetesDiscoveryLifecycle(KubernetesClient client, KubernetesDiscoveryProperties properties) {
        return new KubernetesDiscoveryLifecycle(client, properties);
    }
}

@@ -889,16 +889,98 @@
 operty;%0A
+import org.springframework.boot.context.properties.EnableConfigurationProperties;%0A
 import o
@@ -1019,24 +1019,24 @@
 ation.Bean;%0A
-
 import org.s
@@ -1100,16 +1100,84 @@
 uration%0A
+@EnableConfigurationProperties(KubernetesDiscoveryProperties.class)%0A
 @Conditi
@@ -1267,16 +1267,16 @@
 = true)%0A
+
 public c
@@ -1326,152 +1326,8 @@
  %7B%0A%0A
-    @Bean%0A    public KubernetesDiscoveryProperties kubernetesDiscoveryProperties() %7B%0A        return new KubernetesDiscoveryProperties();%0A    %7D%0A%0A
     

Fix the way that KubernetesDiscoveryProperties are handled.