From 96b3cc9a3914ccf3e081e982920eb59d6ded0468 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 19 Oct 2020 10:54:08 -0400 Subject: [PATCH] Add conditional on enabled annotation for info contributor. Fixes #657. --- docs/src/main/asciidoc/info-contributor.adoc | 7 +++++++ docs/src/main/asciidoc/spring-cloud-kubernetes.adoc | 2 ++ .../cloud/kubernetes/KubernetesAutoConfiguration.java | 2 ++ 3 files changed, 11 insertions(+) create mode 100644 docs/src/main/asciidoc/info-contributor.adoc diff --git a/docs/src/main/asciidoc/info-contributor.adoc b/docs/src/main/asciidoc/info-contributor.adoc new file mode 100644 index 00000000..073dfdca --- /dev/null +++ b/docs/src/main/asciidoc/info-contributor.adoc @@ -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]`. diff --git a/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc b/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc index 4876f418..1d627d1d 100644 --- a/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc +++ b/docs/src/main/asciidoc/spring-cloud-kubernetes.adoc @@ -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[] diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java index 9ccdacd1..034a8e14 100644 --- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java +++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java @@ -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); }