prototype wip

Author: csviri

devnotes.txt

@@ -11,7 +11,7 @@ client cert (no CA) :
 openssl req -nodes -x509 -sha256 -newkey rsa:4096   -keyout client.key   -out client.crt   -days 356   -subj "/C=NL/ST=Zuid Holland/L=Rotterdam/O=system:masters/OU=IT Dept/CN=attila"
 
 run etcd:
- ./etcd --listen-client-urls=http://0.0.0.0:2379 --advertise-client-urls=http://0.0.0.0:2379
+ ./etcd --listen-client-urls=http://0.0.0.0:2379 --advertise-client-urls=http://0.0.0.0:2379 --wal-dir=/home/csviri/.jenvtest/etcddata/ --unsafe-no-fsync=true
 
 run self signed:
 

pom.xml

@@ -72,6 +72,11 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
     </dependencies>
 
 

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

@@ -1,5 +1,6 @@
 package com.csviri.kubeapi;
 
+import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -31,7 +32,7 @@ public APIServer(APIServerConfig config) {
     public void start() {
         log.debug("Stating. Using jenvtest dir: {}", config.getJenvtestDirectory());
         prepareLogDirectory();
-        cleanPreviousState();
+        cleanEtcdData();
         startEtcd();
         startApiServer();
         kubeConfigManager.updateKubeConfig();
@@ -52,6 +53,7 @@ public void stop() {
         stopApiServer();
         stopEtcd();
         kubeConfigManager.cleanupFromKubeConfig();
+        cleanEtcdData();
     }
 
     private void stopApiServer() {
@@ -61,8 +63,12 @@ private void stopApiServer() {
         log.debug("API Server stopped");
     }
 
-    private void cleanPreviousState() {
-        // todo
+    private void cleanEtcdData() {
+        try {
+            FileUtils.deleteDirectory(new File("default.etcd"));
+        } catch (IOException e) {
+            throw new KubeApiException(e);
+        }
     }
 
 
@@ -74,7 +80,7 @@ private void stopEtcd() {
     }
 
     private void waitUntilDefaultNamespaceCreated() {
-
+       // todo
     }
 
     // todo detect if process not started up correctly
@@ -108,19 +114,24 @@ private void startApiServer() {
             }
             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", "--authorization-mode", "RBAC", "--service-account-issuer",
-                    "https://localhost", "--service-account-signing-key-file", certManager.getAPIServerKeyPath(),
+                    "--cert-dir", config.getJenvtestDirectory(),
+                    "--etcd-servers", "http://0.0.0.0:2379",
+                    "--authorization-mode", "RBAC",
+                    "--service-account-issuer", "https://localhost",
+                    "--service-account-signing-key-file", certManager.getAPIServerKeyPath(),
                     "--service-account-signing-key-file", certManager.getAPIServerKeyPath(),
-                    "--service-account-key-file", certManager.getAPIServerKeyPath(), "--service-account-issuer",
-                    certManager.getAPIServerCertPath(),
-                    "--disable-admission-plugins", "ServiceAccount", "--client-ca-file", certManager.getClientCertPath()
-//                    "--service-cluster-ip-range", "10.0.0.0/24",
-//                    "--allow-privileged", "true"
+                    "--service-account-key-file", certManager.getAPIServerKeyPath(),
+                    "--service-account-issuer", certManager.getAPIServerCertPath(),
+                    "--disable-admission-plugins", "ServiceAccount",
+                    "--client-ca-file", certManager.getClientCertPath(),
+                    "--service-cluster-ip-range", "10.0.0.0/24",
+                    "--allow-privileged"
                     )
                     .redirectOutput(logsFile)
                     .redirectError(logsFile)
                     .start();
+              // todo detect premature termination
+//            apiServerProcess.onExit()
             log.debug("API Server started");
         } catch (IOException e) {
             throw new RuntimeException(e);