Merge branch '2.0.x' into main

This commit is contained in:
Ryan Baxter
2021-07-13 14:00:52 -04:00
12 changed files with 310 additions and 74 deletions

View File

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

View File

@@ -9,4 +9,4 @@ The Kubernetes health indicator (which is part of the core module) exposes the f
* A flag that indicates whether the Spring Boot application is internal or external to Kubernetes
You can disable this `HealthContributor` by setting `management.health.kubernetes.enabled`
to `false` in `bootstrap.[properties | yaml]`.
to `false` in `application.[properties | yaml]`.