wip

Author: csviri

src/main/java/com/csviri/kubeapi/APIServer.java

@@ -19,6 +19,7 @@ public class APIServer {
     private final KubeConfigManager kubeConfigManager;
     private Process etcdProcess;
     private volatile Process apiServerProcess;
+    private volatile boolean stopped = false;
 
     public APIServer() {
         this(new APIServerConfig());
@@ -42,6 +43,15 @@ public void start() {
         log.info("API Server ready to use");
     }
 
+    public void stop() {
+        stopped = true;
+        stopApiServer();
+        stopEtcd();
+        kubeConfigManager.cleanupFromKubeConfig();
+        cleanEtcdData();
+        log.debug("Fully stopped.");
+    }
+
     private void prepareLogDirectory() {
         var logDir = new File(config.logDirectory());
         if (!logDir.exists()) {
@@ -52,13 +62,6 @@ private void prepareLogDirectory() {
         }
     }
 
-    public void stop() {
-        stopApiServer();
-        stopEtcd();
-        kubeConfigManager.cleanupFromKubeConfig();
-        cleanEtcdData();
-        log.debug("Fully stopped.");
-    }
 
     private void stopApiServer() {
         if (apiServerProcess != null) {
@@ -127,6 +130,12 @@ private void startEtcd() {
                     .redirectOutput(logsFile)
                     .redirectError(logsFile)
                     .start();
+            etcdProcess.onExit().thenApply(p-> {
+               if (!stopped) {
+                   throw new KubeApiException("Etcd stopped unexpectedly");
+               }
+               return null;
+            });
             log.debug("etcd started");
         } catch (IOException e) {
             throw new KubeApiException(e);
@@ -140,7 +149,7 @@ private void startApiServer() {
             if (!apiServerBinary.exists()) {
                 throw new KubeApiException("Missing binary for API Server on path: " + apiServerBinary.getAbsolutePath());
             }
-            var logsFile = new File(config.logDirectory(), "apiserver.logs");
+
             apiServerProcess = new ProcessBuilder(apiServerBinary.getAbsolutePath(),
                     "--cert-dir", config.getJenvtestDirectory(),
                     "--etcd-servers", "http://0.0.0.0:2379",
@@ -156,6 +165,12 @@ private void startApiServer() {
                     "--allow-privileged"
             )
                     .start();
+            apiServerProcess.onExit().thenApply(p-> {
+                if (!stopped) {
+                    throw new KubeApiException("APIServer stopped unexpectedly.");
+                }
+                return null;
+            });
             log.debug("API Server started");
         } catch (IOException e) {
             throw new RuntimeException(e);

src/main/java/com/csviri/kubeapi/BinaryManager.java

@@ -6,6 +6,7 @@ public class BinaryManager {
     public static final String DEFAULT_VERSION_1_26_1 = "v1.26.1";
     public static final String ETCD_BINARY_NAME = "etcd";
     public static final String API_SERVER_BINARY_NAME = "kube-apiserver";
+    public static final String KUBECTL_BINARY_NAME = "kubectl";
 
     // todo configurable
     //https://dl.k8s.io/v1.26.1/bin/linux/amd64/kube-apiserver
@@ -17,22 +18,27 @@ public BinaryManager(String jenvtestDir) {
         this.jenvtestDir = jenvtestDir;
     }
 
-    public ApiBinaries downloadBinaries() {
+    public ApiBinaries downloadBinariesIfNotPresent() {
+
+
         return null;
     }
 
     public ApiBinaries binaries() {
         return new ApiBinaries(new File(jenvtestDir, ETCD_BINARY_NAME),
-                new File(jenvtestDir, API_SERVER_BINARY_NAME));
+                new File(jenvtestDir, API_SERVER_BINARY_NAME),
+                new File(jenvtestDir, KUBECTL_BINARY_NAME));
     }
 
     public static class ApiBinaries {
         private final File etcd;
         private final File apiServer;
+        private final File kubectl;
 
-        public ApiBinaries(File etcd, File apiServer) {
+        public ApiBinaries(File etcd, File apiServer, File kubectl) {
             this.etcd = etcd;
             this.apiServer = apiServer;
+            this.kubectl = kubectl;
         }
 
         public File getEtcd() {
@@ -42,5 +48,9 @@ public File getEtcd() {
         public File getApiServer() {
             return apiServer;
         }
+
+        public File getKubectl() {
+            return kubectl;
+        }
     }
 }

src/main/java/com/csviri/kubeapi/CertManager.java

@@ -66,6 +66,7 @@ private void generateUserCertificates() throws IOException, InterruptedException
     public String getClientCertPath() {
         return new File(jenvtestDir, CLIENT_CERT_NAME).getAbsolutePath();
     }
+
     public String getClientKeyPath() {
         return new File(jenvtestDir, CLIENT_KEY_NAME).getAbsolutePath();
     }