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

Add conditional on enabled annotation for info contributor. Fixes #657.

Browse Source
This commit is contained in:
Ryan Baxter
2020-10-19 10:54:08 -04:00
parent 4f8ee218f6
commit 96b3cc9a39
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
docs/src/main/asciidoc/info-contributor.adoc Normal file
View File

@@ -0,0 +1,7 @@
== Info Contributor
Spring Cloud Kubernetes includes an `InfoContributor` which adds Pod information to
Spring Boot's `/info` Acturator endpoint.
You can disable this `InfoContributor` by setting `management.info.kubernetes.enabled`
to `false` in `bootstrap.[properties | yaml]`.

2
docs/src/main/asciidoc/spring-cloud-kubernetes.adoc
View File

@@ -21,6 +21,8 @@ include::kubernetes-awareness.adoc[]
include::pod-health-indicator.adoc[]
include::info-contributor.adoc[]
include::leader-election.adoc[]
include::load-balancer.adoc[]

2
spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java
View File

@@ -26,6 +26,7 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
import org.springframework.boot.actuate.autoconfigure.info.ConditionalOnEnabledInfoContributor;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
@@ -166,6 +167,7 @@ public class KubernetesAutoConfiguration {
}
@Bean
@ConditionalOnEnabledInfoContributor("kubernetes")
public KubernetesInfoContributor kubernetesInfoContributor(PodUtils podUtils) {
return new KubernetesInfoContributor(podUtils);
}