Merge pull request #2132 from wind57/add-wait-in-commons

move poll in commons

Author: ryanjbaxter

spring-cloud-kubernetes-client-discovery/src/main/java/org/springframework/cloud/kubernetes/client/discovery/KubernetesClientDiscoveryClientUtils.java

@@ -36,14 +36,14 @@
 import io.kubernetes.client.util.CallGenerator;
 import io.kubernetes.client.util.CallGeneratorParams;
 import io.kubernetes.client.util.Namespaces;
-import io.kubernetes.client.util.wait.Wait;
 import org.apache.commons.logging.LogFactory;
 
 import org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryProperties;
 import org.springframework.cloud.kubernetes.commons.discovery.ServiceMetadata;
 import org.springframework.core.log.LogAccessor;
 import org.springframework.util.CollectionUtils;
 
+import static org.springframework.cloud.kubernetes.commons.discovery.DiscoveryClientUtils.poll;
 import static org.springframework.cloud.kubernetes.commons.discovery.KubernetesDiscoveryConstants.UNSET_PORT_NAME;
 import static org.springframework.util.StringUtils.hasText;
 
@@ -64,7 +64,7 @@ static void postConstruct(List<SharedInformerFactory> sharedInformerFactories,
 			List<Lister<V1Service>> serviceListers) {
 
 		sharedInformerFactories.forEach(SharedInformerFactory::startAllRegisteredInformers);
-		if (!Wait.poll(Duration.ofSeconds(1), Duration.ofSeconds(properties.cacheLoadingTimeoutSeconds()), () -> {
+		if (!poll(Duration.ofSeconds(1), Duration.ofSeconds(properties.cacheLoadingTimeoutSeconds()), () -> {
 			LOG.info(() -> "Waiting for the cache of informers to be fully loaded..");
 			return informersReadyFunc.get();
 		})) {

spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/discovery/DiscoveryClientUtils.java

@@ -16,9 +16,12 @@
 
 package org.springframework.cloud.kubernetes.commons.discovery;
 
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import java.util.function.BooleanSupplier;
 import java.util.function.Function;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -171,6 +174,26 @@ public static ServiceInstance externalNameServiceInstance(ServiceMetadata servic
 
 	}
 
+	public static boolean poll(Duration interval, Duration timeout, BooleanSupplier condition) {
+		long deadline = System.nanoTime() + timeout.toNanos();
+
+		while (System.nanoTime() < deadline) {
+			try {
+				if (condition.getAsBoolean()) {
+					return true;
+				}
+				else {
+					TimeUnit.MILLISECONDS.sleep(interval.toMillis());
+				}
+			}
+			catch (Exception ex) {
+				throw new RuntimeException(ex);
+			}
+
+		}
+		return false;
+	}
+
 	/**
 	 * take primary-port-name from service label "PRIMARY_PORT_NAME_LABEL_KEY" if it
 	 * exists, otherwise from KubernetesDiscoveryProperties if it exists, otherwise null.

spring-cloud-kubernetes-test-support/src/main/java/org/springframework/cloud/kubernetes/integration/tests/commons/native_client/Util.java

@@ -53,6 +53,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.assertj.core.api.Assertions;
+import org.testcontainers.containers.Container;
 import org.testcontainers.k3s.K3sContainer;
 
 import org.springframework.cloud.kubernetes.integration.tests.commons.Images;
@@ -606,7 +607,7 @@ private boolean isDeploymentReady(String deploymentName, String namespace) throw
 		V1Deployment deployment = deployments.getItems().get(0);
 		if (deployment.getStatus() != null) {
 			Integer availableReplicas = deployment.getStatus().getAvailableReplicas();
-			logDeploymentConditions(deployment.getStatus().getConditions());
+			logDeploymentConditions(deployment.getStatus().getConditions(), deployment.getMetadata().getNamespace());
 			LOG.info("Available replicas for " + deploymentName + ": "
 					+ (availableReplicas == null ? 0 : availableReplicas));
 			return availableReplicas != null && availableReplicas >= 1;
@@ -616,13 +617,24 @@ private boolean isDeploymentReady(String deploymentName, String namespace) throw
 		}
 	}
 
-	private void logDeploymentConditions(List<V1DeploymentCondition> conditions) {
+	private void logDeploymentConditions(List<V1DeploymentCondition> conditions, String namespace) {
 		if (conditions != null) {
 			for (V1DeploymentCondition condition : conditions) {
 				LOG.info("Deployment Condition Type: " + condition.getType());
 				LOG.info("Deployment Condition Status: " + condition.getStatus());
 				LOG.info("Deployment Condition Message: " + condition.getMessage());
 				LOG.info("Deployment Condition Reason: " + condition.getReason());
+
+				if (condition.getReason() != null && condition.getReason().contains("ProgressDeadlineExceeded")) {
+					try {
+						Container.ExecResult result = container.execInContainer("sh", "-c",
+								"kubectl get events -n " + namespace);
+						LOG.info("events from namespace : " + result.getStdout());
+					}
+					catch (Exception e) {
+						throw new RuntimeException(e);
+					}
+				}
 			}
 		}
 	}