Support node selection.

org.jdrupes.vmoperator.manager/config-sample.yaml

@@ -5,6 +5,12 @@
     # Values used when creating the PVC for the runner's data
     runnerData:
       storageClassName: null
+    # Amount by which the current cpu count is devided when generating
+    # the resource properties.  
+    cpuOvercommit: 2
+    # Amount by which the current ram size is devided when generating
+    # the resource properties.
+    ramOvercommit: 1.5
   
     # Only for development:
     # namespace: vmop-dev

org.jdrupes.vmoperator.manager/resources/org/jdrupes/vmoperator/manager/runnerSts.ftl.yaml

@@ -34,7 +34,6 @@ spec:
         <#else>
         image: ${ image.repository.asString }/${ image.path.asString }<#if image.version??>:${ image.version.asString }</#if>
         </#if>
-        resources: {}
         <#if image.pullPolicy??>
         imagePullPolicy: ${ image.pullPolicy.asString }
         </#if>
@@ -69,6 +68,28 @@ spec:
         </#list>
         securityContext:
           privileged: true
+        <#if cr.spec.resources??>
+        resources: ${ cr.spec.resources.toString() }
+        <#else>
+        <#if cr.spec.vm.currentCpus?? || cr.spec.vm.currentRam?? >
+        resources:
+          requests:
+            <#if cr.spec.vm.currentCpus?? >
+            <#assign factor = 2.0 />
+            <#if config.cpuOvercommit??>
+            <#assign factor = config.cpuOvercommit * 1.0 />
+            </#if>
+            cpu: ${ (cr.spec.vm.currentCpus.asInt / factor)?floor?c }
+            </#if>
+            <#if cr.spec.vm.currentRam?? >
+            <#assign factor = 1.25 />
+            <#if config.ramOvercommit??>
+            <#assign factor = config.ramOvercommit * 1.0 />
+            </#if>
+            memory: ${ (parseMemory(cr.spec.vm.currentRam.asString) / factor)?floor?c }
+            </#if>
+        </#if>
+        </#if>
       volumes:
       # Not needed because pod is priviledged:
       # - name: dev-kvm
@@ -90,6 +111,15 @@ spec:
           claimName: vmop-image-repository
       hostNetwork: true
       terminationGracePeriodSeconds: ${ (cr.spec.vm.powerdownTimeout.asInt + 5)?c }
+      <#if cr.spec.nodeName??>
+      nodeName: ${ cr.spec.nodeName.asString }
+      </#if>
+      <#if cr.spec.nodeSelector??>
+      nodeSelector: ${ cr.spec.nodeSelector.toString() }
+      </#if>
+      <#if cr.spec.affinity??>
+      affinity: ${ cr.spec.affinity.toString() }
+      </#if>
   volumeClaimTemplates:
   - metadata:
       namespace: ${ cr.metadata.namespace.asString }

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

@@ -32,7 +32,6 @@ import org.apache.commons.cli.Option;
 import org.apache.commons.cli.Options;
 import static org.jdrupes.vmoperator.manager.Constants.VM_OP_NAME;
 import org.jdrupes.vmoperator.util.FsdUtils;
-import org.jgrapes.core.Channel;
 import org.jgrapes.core.Component;
 import org.jgrapes.core.Components;
 import org.jgrapes.core.annotation.Handler;

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

@@ -27,6 +27,8 @@ import freemarker.template.MalformedTemplateNameException;
 import freemarker.template.TemplateException;
 import freemarker.template.TemplateExceptionHandler;
 import freemarker.template.TemplateHashModel;
+import freemarker.template.TemplateMethodModelEx;
+import freemarker.template.TemplateModelException;
 import freemarker.template.TemplateNotFoundException;
 import io.kubernetes.client.openapi.ApiException;
 import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesApi;
@@ -34,10 +36,12 @@ import java.io.IOException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import static org.jdrupes.vmoperator.manager.Constants.VM_OP_GROUP;
 import org.jdrupes.vmoperator.manager.VmDefChanged.Type;
 import org.jdrupes.vmoperator.util.ExtendedObjectWrapper;
+import org.jdrupes.vmoperator.util.ParseUtils;
 import org.jgrapes.core.Channel;
 import org.jgrapes.core.Component;
 import org.jgrapes.core.Components;
@@ -126,19 +130,8 @@ public class Reconciler extends Component {
                 patchCr(K8s.get(vmCrApi, defMeta).get().getRaw().deepCopy()));
         }
 
-        // Get common data for all reconciles
-        JsonObject vmDef = channel.vmDefinition();
-        @SuppressWarnings("PMD.UseConcurrentHashMap")
-        Map<String, Object> model = new HashMap<>();
-        model.put("cr", vmDef);
-        model.put("constants",
-            (TemplateHashModel) new DefaultObjectWrapperBuilder(
-                Configuration.VERSION_2_3_32)
-                    .build().getStaticModels()
-                    .get(Constants.class.getName()));
-        model.put("config", config);
-
         // Reconcile
+        Map<String, Object> model = prepareModel(channel.vmDefinition());
         if (event.type() != Type.DELETED) {
             var configMap = cmReconciler.reconcile(event, model, channel);
             model.put("cm", configMap.getRaw());
@@ -151,6 +144,39 @@ public class Reconciler extends Component {
         }
     }
 
+    private Map<String, Object> prepareModel(JsonObject vmDef)
+            throws TemplateModelException {
+        @SuppressWarnings("PMD.UseConcurrentHashMap")
+        Map<String, Object> model = new HashMap<>();
+        model.put("cr", vmDef);
+        model.put("constants",
+            (TemplateHashModel) new DefaultObjectWrapperBuilder(
+                Configuration.VERSION_2_3_32)
+                    .build().getStaticModels()
+                    .get(Constants.class.getName()));
+        model.put("config", config);
+
+        // Methods
+        model.put("parseMemory", new TemplateMethodModelEx() {
+            @Override
+            @SuppressWarnings("PMD.PreserveStackTrace")
+            public Object exec(@SuppressWarnings("rawtypes") List arguments)
+                    throws TemplateModelException {
+                var arg = arguments.get(0);
+                if (arg instanceof Number number) {
+                    return number;
+                }
+                try {
+                    return ParseUtils.parseMemory(arg.toString());
+                } catch (NumberFormatException e) {
+                    throw new TemplateModelException("Cannot parse memory "
+                        + "specified as \"" + arg + "\": " + e.getMessage());
+                }
+            }
+        });
+        return model;
+    }
+
     private JsonObject patchCr(JsonObject vmDef) {
         // Adjust cdromImage path
         var disks