Merge pull request #1790 from anderbubble/upgrade-kernel-args

Change upgraded default kernel args to match distributed `nodes.conf`

CHANGELOG.md

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - Support Ubuntu-style dracut initrd images.
 
+### Changed
+
+- Match default kernel arguments from `wwctl upgrade nodes` with the distributed `nodes.conf`.
+
 ### Fixed
 
 - Fix nightly builds.

internal/pkg/upgrade/node.go

@@ -123,7 +123,7 @@ func (legacy *NodesYaml) Upgrade(addDefaults bool, replaceOverlays bool, warewul
 				defaultProfile.RuntimeOverlay, genericSplitOverlays...)
 		}
 		if len(defaultProfile.Kernel.Args) < 1 {
-			defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no", "vga=791", "net.naming-scheme=v238"}
+			defaultProfile.Kernel.Args = []string{"quiet", "crashkernel=no"}
 		}
 		if defaultProfile.Init == "" {
 			defaultProfile.Init = "/sbin/init"

internal/pkg/upgrade/node_test.go

@@ -576,8 +576,6 @@ nodeprofiles:
       args:
       - quiet
       - crashkernel=no
-      - vga=791
-      - net.naming-scheme=v238
     init: /sbin/init
     root: initramfs
     resources:
@@ -656,8 +654,6 @@ nodeprofiles:
       args:
       - quiet
       - crashkernel=no
-      - vga=791
-      - net.naming-scheme=v238
     init: /sbin/init
     root: initramfs
     resources:
@@ -919,8 +915,6 @@ nodeprofiles:
       args:
       - quiet
       - crashkernel=no
-      - vga=791
-      - net.naming-scheme=v238
     init: /sbin/init
     root: initramfs
     resources: