Feature/web gui (#15)

Add node display.

org.jdrupes.vmoperator.manager/build.gradle

@@ -19,7 +19,7 @@ dependencies {
     implementation 'org.jgrapes:org.jgrapes.util:[1.31.0,2)'
     
     implementation 'org.jgrapes:org.jgrapes.webconsole.base:[1.2.0,2)'
-    implementation 'org.jgrapes:org.jgrapes.webconsole.vuejs:[1.3.0,2)'
+    implementation 'org.jgrapes:org.jgrapes.webconsole.vuejs:[1.5.0,2)'
     implementation 'org.jgrapes:org.jgrapes.webconsole.rbac:[1.0.0,2)'
     implementation 'org.jgrapes:org.jgrapes.webconlet.locallogin:[1.0.0,2)'
     
@@ -39,7 +39,7 @@ dependencies {
 
 application {
     applicationName = 'vm-manager'
-    applicationDefaultJvmArgs = ['-Xmx50m', '-XX:+UseParallelGC',
+    applicationDefaultJvmArgs = ['-Xmx128m', '-XX:+UseParallelGC',
         '-Djava.util.logging.manager=org.jdrupes.vmoperator.util.LongLoggingManager'
         ]
     // Define the main class for the application.

org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Constants.java

@@ -23,9 +23,6 @@ package org.jdrupes.vmoperator.manager;
  */
 public class Constants extends org.jdrupes.vmoperator.common.Constants {
 
-    /** The Constant APP_NAME. */
-    public static final String APP_NAME = "vm-runner";
-
     /** The Constant STATE_RUNNING. */
     public static final String STATE_RUNNING = "Running";
 

org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/VmWatcher.java

@@ -18,6 +18,8 @@
 
 package org.jdrupes.vmoperator.manager;
 
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import io.kubernetes.client.openapi.ApiClient;
 import io.kubernetes.client.openapi.ApiException;
@@ -31,6 +33,7 @@ import io.kubernetes.client.openapi.models.V1ObjectMeta;
 import io.kubernetes.client.util.Config;
 import io.kubernetes.client.util.Watch;
 import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesApi;
+import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesObject;
 import io.kubernetes.client.util.generic.options.ListOptions;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -52,6 +55,7 @@ import static org.jdrupes.vmoperator.manager.Constants.VM_OP_NAME;
 import org.jdrupes.vmoperator.manager.events.VmChannel;
 import org.jdrupes.vmoperator.manager.events.VmDefChanged;
 import org.jdrupes.vmoperator.manager.events.VmDefChanged.Type;
+import org.jdrupes.vmoperator.util.GsonPtr;
 import org.jgrapes.core.Channel;
 import org.jgrapes.core.Component;
 import org.jgrapes.core.Components;
@@ -251,8 +255,8 @@ public class VmWatcher extends Component {
     }
 
     private void handleVmDefinitionChange(V1APIResource vmsCrd,
-            Watch.Response<V1Namespace> item) {
-        V1ObjectMeta metadata = item.object.getMetadata();
+            Watch.Response<V1Namespace> vmDefStub) {
+        V1ObjectMeta metadata = vmDefStub.object.getMetadata();
         VmChannel channel = channels.computeIfAbsent(metadata.getName(),
             k -> {
                 try {
@@ -268,20 +272,52 @@ public class VmWatcher extends Component {
             return;
         }
 
-        // if (event.type() == Type.DELETED) {
-
         // Get full definition and associate with channel as backup
-        var apiVersion = K8s.version(item.object.getApiVersion());
+        var apiVersion = K8s.version(vmDefStub.object.getApiVersion());
         DynamicKubernetesApi vmCrApi = new DynamicKubernetesApi(VM_OP_GROUP,
             apiVersion, vmsCrd.getName(), channel.client());
-        var vmDef = K8s.get(vmCrApi, metadata);
-        vmDef.ifPresent(def -> channel.setVmDefinition(def));
+        var curVmDef = K8s.get(vmCrApi, metadata);
+        curVmDef.ifPresent(def -> channel.setVmDefinition(def));
+
+        // Get eventual definition and augment with "dynamic" data.
+        var vmDef = curVmDef.orElse(channel.vmDefinition());
+        addDynamicData(channel, vmDef);
 
         // Create and fire event
         channel.pipeline().fire(new VmDefChanged(VmDefChanged.Type
-            .valueOf(item.type),
-            channel.setGeneration(item.object.getMetadata().getGeneration()),
-            vmsCrd, vmDef.orElse(channel.vmDefinition())), channel);
+            .valueOf(vmDefStub.type),
+            channel
+                .setGeneration(vmDefStub.object.getMetadata().getGeneration()),
+            vmsCrd, vmDef), channel);
+    }
+
+    private void addDynamicData(VmChannel channel,
+            DynamicKubernetesObject vmDef) {
+        var rootNode = GsonPtr.to(vmDef.getRaw()).get(JsonObject.class);
+        rootNode.addProperty("nodeName", "");
+
+        // VM definition status changes before the pod terminates.
+        // This results in pod information being shown for a stopped
+        // VM which is irritating. So check condition first.
+        var isRunning = GsonPtr.to(rootNode).to("status", "conditions")
+            .get(JsonArray.class)
+            .asList().stream().filter(el -> "Running"
+                .equals(((JsonObject) el).get("type").getAsString()))
+            .findFirst().map(el -> "True"
+                .equals(((JsonObject) el).get("status").getAsString()))
+            .orElse(false);
+        if (!isRunning) {
+            return;
+        }
+        var podSearch = new ListOptions();
+        podSearch.setLabelSelector("app.kubernetes.io/name=" + APP_NAME
+            + ",app.kubernetes.io/component=" + APP_NAME
+            + ",app.kubernetes.io/instance=" + vmDef.getMetadata().getName());
+        var podList = K8s.podApi(channel.client()).list(namespaceToWatch,
+            podSearch);
+        podList.getObject().getItems().stream().forEach(pod -> {
+            rootNode.addProperty("nodeName", pod.getSpec().getNodeName());
+        });
     }
 
     /**