From 34e97dd8184ded4660d64ddc09823eff74aabab0 Mon Sep 17 00:00:00 2001 From: erabii Date: Fri, 17 Jan 2025 19:14:56 +0200 Subject: [PATCH] try to fix failing tests (#1841) * fix Signed-off-by: wind57 * fix Signed-off-by: wind57 --------- Signed-off-by: wind57 --- .../src/main/resources/application-mount.yaml | 4 ++-- .../src/main/resources/application-no-mount.yaml | 4 ++-- .../src/main/resources/application-with-bootstrap.yaml | 4 ++-- .../reload/BootstrapEnabledPollingReloadConfigMapMountIT.java | 4 ++++ .../client/reload/ConfigMapMountPollingReloadDelegateIT.java | 2 ++ 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml index a035e13d..2edaa955 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-mount.yaml +++ b/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 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml index 12bc7a05..4e98ed70 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-no-mount.yaml +++ b/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 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml index c997322d..2f714776 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/main/resources/application-with-bootstrap.yaml +++ b/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 diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java index b2c37e19..39a7ac0d 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/BootstrapEnabledPollingReloadConfigMapMountIT.java +++ b/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 @@ class BootstrapEnabledPollingReloadConfigMapMountIT { 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) diff --git a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapMountPollingReloadDelegateIT.java b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapMountPollingReloadDelegateIT.java index e9f0dc58..c733c17c 100644 --- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-fabric8-client-reload/src/test/java/org/springframework/cloud/kubernetes/fabric8/client/reload/ConfigMapMountPollingReloadDelegateIT.java +++ b/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 @@ class ConfigMapMountPollingReloadDelegateIT { 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)