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

Merge remote-tracking branch 'origin/1.1.x'

Browse Source 
# Conflicts:
#	spring-cloud-kubernetes-integration-tests/load-balancer/pom.xml
#	spring-cloud-kubernetes-integration-tests/pom.xml
#	spring-cloud-kubernetes-loadbalancer/pom.xml
#	spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerAutoConfiguration.java
#	spring-cloud-starter-kubernetes-loadbalancer/pom.xml
This commit is contained in:
Olga Maciaszek-Sharma
2020-08-28 13:17:12 +02:00
parent 5350e92328 14f02dbff1
commit 039f8c0bd7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-kubernetes-loadbalancer/src/main/java/org/springframework/cloud/kubernetes/loadbalancer/KubernetesLoadBalancerAutoConfiguration.java
View File

@@ -30,7 +30,8 @@ import org.springframework.context.annotation.Configuration;
*/
@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties(KubernetesLoadBalancerProperties.class)
@ConditionalOnProperty("spring.cloud.kubernetes.loadbalancer.enabled")
@ConditionalOnProperty(value = "spring.cloud.kubernetes.loadbalancer.enabled",
matchIfMissing = true)
@LoadBalancerClients(
defaultConfiguration = KubernetesLoadBalancerClientConfiguration.class)
public class KubernetesLoadBalancerAutoConfiguration {