Add generation of fallback properties.

mnlipp · Feb 18, 2024 · ee96f86 · ee96f86
1 parent 7835686
commit ee96f86
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/dev-example/test-vm.yaml b/dev-example/test-vm.yaml
@@ -14,6 +14,8 @@ spec:
       cpu: 1
       memory: 2Gi
 
+  cloudInit: {}
+
   vm:
     # state: Running
     bootMenu: yes

diff --git a/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java b/org.jdrupes.vmoperator.manager/src/org/jdrupes/vmoperator/manager/Reconciler.java
@@ -209,6 +209,15 @@ public void onVmDefChanged(VmDefChanged event, VmChannel channel)
     private DynamicKubernetesObject patchCr(DynamicKubernetesObject vmDef) {
         var json = vmDef.getRaw().deepCopy();
         // Adjust cdromImage path
+        adjustCdRomPaths(json);
+
+        // Adjust cloud-init data
+        adjustCloudInitData(json);
+
+        return new DynamicKubernetesObject(json);
+    }
+
+    private void adjustCdRomPaths(JsonObject json) {
         var disks
             = GsonPtr.to(json).to("spec", "vm", "disks").get(JsonArray.class);
         for (var disk : disks) {
@@ -233,7 +242,23 @@ private DynamicKubernetesObject patchCr(DynamicKubernetesObject vmDef) {
                 logger.warning(() -> "Invalid CDROM image: " + image);
             }
         }
-        return new DynamicKubernetesObject(json);
+    }
+
+    private void adjustCloudInitData(JsonObject json) {
+        var spec = GsonPtr.to(json).to("spec").get(JsonObject.class);
+        if (!spec.has("cloudInit")) {
+            return;
+        }
+        var metaData = GsonPtr.to(spec).to("cloudInit", "metaData");
+        if (metaData.getAsString("instance-id").isEmpty()) {
+            metaData.set("instance-id",
+                GsonPtr.to(json).getAsString("metadata", "resourceVersion")
+                    .map(s -> "v" + s).orElse("v1"));
+        }
+        if (metaData.getAsString("local-hostname").isEmpty()) {
+            metaData.set("local-hostname",
+                GsonPtr.to(json).getAsString("metadata", "name").get());
+        }
     }
 
     @SuppressWarnings("PMD.CognitiveComplexity")
@@ -300,5 +325,4 @@ public Object exec(@SuppressWarnings("rawtypes") List arguments)
         });
         return model;
     }
-
 }