Updated wwinit for clarity #1156

Also:

- Renamed /warewulf/wwinit to /warewulf/prescripts

Signed-off-by: Jonathon Anderson <janderson@ciq.com>

internal/pkg/upgrade/node.go

@@ -165,6 +165,7 @@ type Node struct {
 func (legacy *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *node.Node) {
 	upgraded = new(node.Node)
 	upgraded.Tags = make(map[string]string)
+	upgraded.Resources = make(map[string]node.Resource)
 	upgraded.Disks = make(map[string]*node.Disk)
 	upgraded.FileSystems = make(map[string]*node.FileSystem)
 	upgraded.Ipmi = new(node.IpmiConf)
@@ -332,6 +333,11 @@ func (legacy *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *n
 				genericSplitOverlays)
 		}
 	}
+	if legacy.Resources != nil {
+		for key, value := range legacy.Resources {
+			upgraded.Resources[key] = value
+		}
+	}
 	return
 }
 

internal/pkg/upgrade/node_test.go

@@ -254,7 +254,7 @@ nodes:
 `,
 	},
 	{
-		name:            "keys and tags",
+		name:            "keys, tags, and resources",
 		addDefaults:     false,
 		replaceOverlays: false,
 		legacyYaml: `
@@ -269,6 +269,13 @@ nodeprofiles:
       key4: valD
     tagsdel:
       - key4
+    resources:
+      res1:
+        - val1a
+        - val1b
+      res2:
+        - val2a
+        - val2b
     network devices:
       default:
         tags:
@@ -295,6 +302,13 @@ nodes:
       key4: valD
     tagsdel:
       - key4
+    resources:
+      resn1:
+        - valn1a
+        - valn1b
+      resn2:
+        - valn2a
+        - valn2b
     network devices:
       default:
         tags:
@@ -327,6 +341,13 @@ nodeprofiles:
       key1: val1
       key2: valB
       key3: valC
+    resources:
+      res1:
+        - val1a
+        - val1b
+      res2:
+        - val2a
+        - val2b
 nodes:
   n1:
     ipmi:
@@ -342,6 +363,13 @@ nodes:
       key1: val1
       key2: valB
       key3: valC
+    resources:
+      resn1:
+        - valn1a
+        - valn1b
+      resn2:
+        - valn2a
+        - valn2b
 `,
 	},
 	{