diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java index 63afce4..9899b7d 100644 --- a/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java +++ b/core/src/main/java/io/javaoperatorsdk/jenvtest/KubeAPIServer.java @@ -37,6 +37,11 @@ public KubeAPIServer(KubeAPIServerConfig config) { } public void start() { + startAsync(); + waitUntilReady(); + } + + public void startAsync() { log.debug("Stating API Server. Using jenvtest dir: {}", config.getJenvtestDir()); binaryManager.initAndDownloadIfRequired(); certManager.createCertificatesIfNeeded(); @@ -45,6 +50,9 @@ public void start() { if (config.isUpdateKubeConfig()) { kubeConfig.updateKubeConfig(apiServerPort); } + } + + public void waitUntilReady() { kubeApiServerProcess.waitUntilReady(); log.debug("API Server ready to use"); } diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/process/KubeAPIServerProcess.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/process/KubeAPIServerProcess.java index aef9548..38d6698 100644 --- a/core/src/main/java/io/javaoperatorsdk/jenvtest/process/KubeAPIServerProcess.java +++ b/core/src/main/java/io/javaoperatorsdk/jenvtest/process/KubeAPIServerProcess.java @@ -89,9 +89,7 @@ public void waitUntilReady() { var readinessChecker = new ProcessReadinessChecker(); var timeout = config.getStartupTimeout(); var startTime = System.currentTimeMillis(); - // the 1.29.0 binary has issue with this. Will temporarily comment out and further investigate. - // But with this now all the executions are failing - // readinessChecker.waitUntilReady(apiServerPort, "readyz", KUBE_API_SERVER, true, timeout); + readinessChecker.waitUntilReady(apiServerPort, "readyz", KUBE_API_SERVER, true, timeout); int newTimout = (int) (timeout - (System.currentTimeMillis() - startTime)); readinessChecker.waitUntilDefaultNamespaceAvailable(apiServerPort, binaryManager, certManager, config, newTimout); diff --git a/core/src/main/java/io/javaoperatorsdk/jenvtest/process/ProcessReadinessChecker.java b/core/src/main/java/io/javaoperatorsdk/jenvtest/process/ProcessReadinessChecker.java index f614767..df5dd8c 100644 --- a/core/src/main/java/io/javaoperatorsdk/jenvtest/process/ProcessReadinessChecker.java +++ b/core/src/main/java/io/javaoperatorsdk/jenvtest/process/ProcessReadinessChecker.java @@ -179,6 +179,7 @@ public void checkServerTrusted( null); return HttpClient.newBuilder() .sslContext(sslContext) + .version(HttpClient.Version.HTTP_1_1) .build(); } catch (NoSuchAlgorithmException | KeyManagementException e) { throw new JenvtestException(e);