Merge branch '3.2.x'

Author: ryanjbaxter

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml

@@ -6,9 +6,9 @@ spring:
       reload:
         enabled: true
         monitoring-config-maps: true
-        strategy: shutdown
+        strategy: refresh
         mode: polling
-        period: 5000
+        period: 5s
       config:
         paths:
           - /tmp/application.properties

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml

@@ -8,7 +8,7 @@ spring:
       reload:
         enabled: true
         monitoring-config-maps: true
-        strategy: shutdown
+        strategy: refresh
         mode: polling
-        period: 5000
+        period: 5s
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml

@@ -6,7 +6,7 @@ spring:
       reload:
         enabled: true
         monitoring-config-maps: true
-        strategy: shutdown
+        strategy: refresh
         mode: polling
-        period: 5000
+        period: 5s
 

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java

@@ -112,6 +112,10 @@ void test() {
 		configMap.setData(Map.of(Constants.APPLICATION_PROPERTIES, "from.properties.key=as-mount-changed"));
 		client.configMaps().inNamespace("default").resource(configMap).createOrReplace();
 
+		System.out.println("Waiting for reload change to be observed");
+		Commons.waitForLogStatement("Detected change in config maps/secrets, reload will be triggered", K3S, IMAGE_NAME);
+		System.out.println("reload change observed");
+
 		await().atMost(Duration.ofSeconds(120))
 			.pollInterval(Duration.ofSeconds(1))
 			.until(() -> webClient.method(HttpMethod.GET)

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapMountPollingReloadDelegateIT.java

@@ -113,6 +113,8 @@ void test() {
 		configMap.setData(Map.of(Constants.APPLICATION_PROPERTIES, "from.properties.key=as-mount-changed"));
 		client.configMaps().inNamespace("default").resource(configMap).createOrReplace();
 
+		Commons.waitForLogStatement("Detected change in config maps/secrets, reload will be triggered", K3S, IMAGE_NAME);
+
 		await().atMost(Duration.ofSeconds(120))
 			.pollInterval(Duration.ofSeconds(1))
 			.until(() -> webClient.method(HttpMethod.GET)