Merge branch '2.0.x' into main

# Conflicts: # docs/pom.xml # pom.xml # spring-cloud-kubernetes-client-autoconfig/pom.xml # spring-cloud-kubernetes-client-config/pom.xml # spring-cloud-kubernetes-client-discovery/pom.xml # spring-cloud-kubernetes-client-loadbalancer/pom.xml # spring-cloud-kubernetes-commons/pom.xml # spring-cloud-kubernetes-controllers/pom.xml # spring-cloud-kubernetes-controllers/spring-cloud-kubernetes-configuration-watcher/pom.xml # spring-cloud-kubernetes-dependencies/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-loadbalancer-example/greeting-service/pom.xml # spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/name-service/pom.xml # spring-cloud-kubernetes-examples/kubernetes-loadbalancer-example/pom.xml # spring-cloud-kubernetes-examples/kubernetes-reload-example/pom.xml # spring-cloud-kubernetes-examples/pom.xml # spring-cloud-kubernetes-fabric8-autoconfig/pom.xml # spring-cloud-kubernetes-fabric8-config/pom.xml # spring-cloud-kubernetes-fabric8-discovery/pom.xml # spring-cloud-kubernetes-fabric8-istio/pom.xml # spring-cloud-kubernetes-fabric8-leader/pom.xml # spring-cloud-kubernetes-fabric8-loadbalancer/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/kubernetes-client-discovery/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/load-balancer/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-integration-tests/spring-cloud-kubernetes-client-config-it/pom.xml # spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/pom.xml # spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-reactive-discovery-client-it/pom.xml # spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-configuration-watcher-it/pom.xml # spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-core-k8s-client-it/pom.xml # spring-cloud-kubernetes-test-support/pom.xml # spring-cloud-starter-kubernetes-client-all/pom.xml # spring-cloud-starter-kubernetes-client-config/pom.xml # spring-cloud-starter-kubernetes-client-loadbalancer/pom.xml # spring-cloud-starter-kubernetes-client/pom.xml # spring-cloud-starter-kubernetes-fabric8-all/pom.xml # spring-cloud-starter-kubernetes-fabric8-config/pom.xml # spring-cloud-starter-kubernetes-fabric8-loadbalancer/pom.xml # spring-cloud-starter-kubernetes-fabric8/pom.xml
2021-09-21 21:01:12 -04:00
parent 483a612fcf 6f9afa83bd
commit 449ec5044a
1 changed files with 2 additions and 1 deletions
--- a/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java
+++ b/spring-cloud-kubernetes-integration-tests/spring-cloud-kubernetes-client-loadbalancer-it/src/test/java/org/springframework/cloud/kubernetes/client/loadbalancer/it/LoadBalancerIT.java
@@ -19,6 +19,7 @@ package org.springframework.cloud.kubernetes.client.loadbalancer.it;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;

 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
@@ -142,7 +143,7 @@ public class LoadBalancerIT {
 		});
 		// Sometimes the NGINX ingress takes a bit to catch up and realize the service is
 		// available and we get a 503, we just need to wait a bit
-		await().timeout(Duration.ofSeconds(60))
+		await().pollInterval(Duration.ofSeconds(1)).atMost(600, TimeUnit.SECONDS).ignoreExceptions()
 				.until(() -> rest.getForEntity("http://localhost:80/loadbalancer-it/servicea", String.class)
 						.getStatusCode().is2xxSuccessful());
 		Map<String, Object> result = rest.getForObject("http://localhost:80/loadbalancer-it/servicea", Map.class);