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

# Conflicts:
#	docs/pom.xml
#	pom.xml
#	spring-cloud-kubernetes-config/pom.xml
#	spring-cloud-kubernetes-core/pom.xml
#	spring-cloud-kubernetes-dependencies/pom.xml
#	spring-cloud-kubernetes-discovery/pom.xml
#	spring-cloud-kubernetes-examples/kubernetes-hello-world-example/pom.xml
#	spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml
#	spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml
#	spring-cloud-kubernetes-examples/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/discovery-client/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/discovery-service-a/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/discovery-service-b/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/pom.xml
#	spring-cloud-kubernetes-integration-tests/discovery/tests/pom.xml
#	spring-cloud-kubernetes-integration-tests/istio/pom.xml
#	spring-cloud-kubernetes-integration-tests/pom.xml
#	spring-cloud-kubernetes-integration-tests/simple-configmap/pom.xml
#	spring-cloud-kubernetes-integration-tests/simple-core/pom.xml
#	spring-cloud-kubernetes-istio/pom.xml
#	spring-cloud-kubernetes-leader/pom.xml
#	spring-cloud-starter-kubernetes-all/pom.xml
#	spring-cloud-starter-kubernetes-config/pom.xml
#	spring-cloud-starter-kubernetes/pom.xml
This commit is contained in:
Ryan Baxter
2020-06-23 10:12:30 -04:00

View File

@@ -473,9 +473,26 @@ The reload feature of Spring Cloud Kubernetes is able to trigger an application
By default, this feature is disabled. You can enable it by using the `spring.cloud.kubernetes.reload.enabled=true` configuration property (for example, in the `application.properties` file).
The following levels of reload are supported (by setting the `spring.cloud.kubernetes.reload.strategy` property):
* `refresh` (default): Only configuration beans annotated with `@ConfigurationProperties` or `@RefreshScope` are reloaded.
This reload level leverages the refresh feature of Spring Cloud Context.
* `restart_context`: the whole Spring `ApplicationContext` is gracefully restarted. Beans are recreated with the new configuration.
In order for the restart context functionality to work properly you must enable and expose the restart actuator endpoint
[source,yaml]
====
----
management:
endpoint:
restart:
enabled: true
endpoints:
web:
exposure:
include: restart
----
====
* `shutdown`: the Spring `ApplicationContext` is shut down to activate a restart of the container.
When you use this level, make sure that the lifecycle of all non-daemon threads is bound to the `ApplicationContext`
and that a replication controller or replica set is configured to restart the pod.