Merge pull request #21 from CommonWorkflowScheduler/publishDir

Publish dir

Author: Lehmann-Fabian

src/main/java/cws/k8s/scheduler/Main.java

@@ -1,67 +1,73 @@
-package cws.k8s.scheduler;
-
-import jakarta.annotation.PostConstruct;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.info.BuildProperties;
-
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-@SpringBootApplication
-@Slf4j
-public class Main {
-
-    private final BuildProperties buildProperties;
-
-    Main( @Autowired BuildProperties buildProperties ) {
-        this.buildProperties = buildProperties;
-    }
-
-    public static void main(String[] args) {
-        if( System.getenv( "SCHEDULER_NAME" ) == null || System.getenv( "SCHEDULER_NAME" ).isEmpty() ){
-            throw new IllegalArgumentException( "Please define environment variable: SCHEDULER_NAME" );
-        }
-        SpringApplication.run(Main.class, args);
-    }
-
-    @PostConstruct
-    private void logVersion() {
-        DateFormat format = new SimpleDateFormat("dd/MM/yy-HH:mm:ss");
-        final long buildDate = Long.parseLong( buildProperties.get( "time" ) );
-        Date date = new Date( buildDate );
-        final String dateString = format.format( date );
-        final String version = buildProperties.getVersion();
-        String[] text = {
-                "",
-                "Common Workflow Scheduler for Kubernetes " + version + " (" + dateString + ")",
-                "",
-                "If you use the Common Workflow Scheduler for research purposes, please cite the following:",
-                "Lehmann Fabian, Jonathan Bader, Friedrich Tschirpke, Lauritz Thamsen, and Ulf Leser.",
-                "\"How Workflow Engines Should Talk to Resource Managers: A Proposal for a Common Workflow",
-                "Scheduling Interface.\" In 2023 IEEE/ACM 23rd International Symposium on Cluster, Cloud and",
-                "Internet Computing (CCGrid). Bangalore, India, 2023.",
-                ""
-        };
-
-        int longest = 0;
-        for ( String s : text ) {
-            if ( s.length() > longest ) {
-                longest = s.length();
-            }
-        }
-
-        String info = "=".repeat( longest + 6 ) + "\n";
-        for ( String s : text ) {
-            info += "=  " + s + " ".repeat( longest - s.length() ) + "  =\n";
-        }
-        info += "=".repeat( longest + 6 ) + "\n";
-
-        log.info( "\n\n\n" + info + "\n" );
-
-    }
-
-}
+package cws.k8s.scheduler;
+
+import jakarta.annotation.PostConstruct;
+import lombok.extern.slf4j.Slf4j;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.info.BuildProperties;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+@SpringBootApplication
+@Slf4j
+public class Main {
+
+    private final BuildProperties buildProperties;
+
+    Main( @Autowired BuildProperties buildProperties ) {
+        this.buildProperties = buildProperties;
+    }
+
+    public static void main(String[] args) {
+        if( System.getenv( "SCHEDULER_NAME" ) == null || System.getenv( "SCHEDULER_NAME" ).isEmpty() ){
+            throw new IllegalArgumentException( "Please define environment variable: SCHEDULER_NAME" );
+        }
+        SpringApplication.run(Main.class, args);
+    }
+
+    @PostConstruct
+    private void logVersion() {
+        DateFormat format = new SimpleDateFormat("dd/MM/yy-HH:mm:ss");
+        final long buildDate = Long.parseLong( buildProperties.get( "time" ) );
+        Date date = new Date( buildDate );
+        final String dateString = format.format( date );
+        final String[] text = getMessage( dateString );
+
+        int longest = 0;
+        for ( String s : text ) {
+            if ( s.length() > longest ) {
+                longest = s.length();
+            }
+        }
+
+        String info = "=".repeat( longest + 6 ) + "\n";
+        for ( String s : text ) {
+            info += "=  " + s + " ".repeat( longest - s.length() ) + "  =\n";
+        }
+        info += "=".repeat( longest + 6 ) + "\n";
+
+        log.info( "\n\n\n" + info + "\n" );
+
+    }
+
+    private String @NotNull [] getMessage( String dateString ) {
+        final String version = buildProperties.getVersion();
+        String[] text = {
+                "",
+                "Common Workflow Scheduler for Kubernetes " + version + " (" + dateString + ")",
+                "",
+                "If you use the Common Workflow Scheduler for research purposes, please cite the following:",
+                "Lehmann Fabian, Jonathan Bader, Friedrich Tschirpke, Lauritz Thamsen, and Ulf Leser.",
+                "\"How Workflow Engines Should Talk to Resource Managers: A Proposal for a Common Workflow",
+                "Scheduling Interface.\" In 2023 IEEE/ACM 23rd International Symposium on Cluster, Cloud and",
+                "Internet Computing (CCGrid). Bangalore, India, 2023.",
+                ""
+        };
+        return text;
+    }
+
+}

src/main/java/cws/k8s/scheduler/client/CWSKubernetesClient.java

@@ -5,8 +5,8 @@
 import cws.k8s.scheduler.model.Task;
 import cws.k8s.scheduler.util.MyExecListner;
 import io.fabric8.kubernetes.api.model.*;
-import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.*;
+import io.fabric8.kubernetes.client.Config;
 import io.fabric8.kubernetes.client.dsl.*;
 import lombok.extern.slf4j.Slf4j;
 
@@ -166,18 +166,6 @@ private void createPod( Pod pod ) {
                 .create();
     }
 
-    public void assignPodToNodeAndRemoveInit( PodWithAge pod, String node ) {
-        if ( pod.getSpec().getInitContainers().size() > 0 ) {
-            pod.getSpec().getInitContainers().remove( 0 );
-        }
-        pod.getMetadata().setResourceVersion( null );
-        pod.getMetadata().setManagedFields( null );
-        pod.getSpec().setNodeName( node );
-
-        forceDeletePod( pod );
-        createPod( pod );
-    }
-
     public void execCommand( String podName, String namespace, String[] command, MyExecListner listener ){
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         ByteArrayOutputStream error = new ByteArrayOutputStream();