Skip to content

Commit 8ba1258

Browse files
committed
Kubernetes: wait for proxy.container-wait-time before pod is ready
1 parent 1a64723 commit 8ba1258

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

src/main/java/eu/openanalytics/containerproxy/backend/kubernetes/KubernetesBackend.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,8 +268,11 @@ protected Container startContainer(ContainerSpec spec, Proxy proxy) throws Excep
268268

269269
Pod startedPod = kubeClient.pods().inNamespace(effectiveKubeNamespace).create(patchedPod);
270270

271-
// Workaround: waitUntilReady appears to be buggy.
272-
Retrying.retry(i -> Readiness.isReady(kubeClient.resource(startedPod).fromServer().get()), 60, 1000);
271+
int totalWaitMs = Integer.parseInt(environment.getProperty("proxy.container-wait-time", "20000"));
272+
Retrying.retry(i -> Readiness.isReady(kubeClient.resource(startedPod).fromServer().get()), totalWaitMs / 1000, 1000);
273+
if (!Readiness.isReady(kubeClient.resource(startedPod).fromServer().get())) {
274+
throw new ContainerProxyException("Container did not become ready in time");
275+
}
273276
Pod pod = kubeClient.resource(startedPod).fromServer().get();
274277

275278
Service service = null;

0 commit comments

Comments
 (0)