Merge branch '3.2.x' into 3.3.x

Author: ryanjbaxter

spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-k8s-client-reload/src/test/java/org/springframework/cloud/kubernetes/k8s/client/reload/it/K8sClientConfigMapMountPollingIT.java

@@ -23,7 +23,6 @@
 import io.kubernetes.client.openapi.models.V1ConfigMap;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.testcontainers.k3s.K3sContainer;
 
@@ -86,8 +85,6 @@ static void afterAll() {
 	 * </pre>
 	 */
 	@Test
-	// TODO This fails intermittently on Jenkins
-	@Disabled
 	void test() throws Exception {
 		// (1)
 		Commons.waitForLogStatement("paths property sources : [/tmp/application.properties]", K3S, IMAGE_NAME);