wwctl upgrade nodes --replace-overlays avoids applying overlays multiple times

- Closes: #1823

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-03-24 18:50:43 -06:00
parent 989284c01e
commit dd2d256179
4 changed files with 126 additions and 25 deletions

View File

@@ -676,7 +676,7 @@ nodes:
`,
},
{
name: "replace overlays conflicts",
name: "replace overlays",
addDefaults: false,
replaceOverlays: true,
legacyYaml: `
@@ -736,6 +736,99 @@ nodes:
- debian.interfaces
- wicked
- ignition
`,
},
{
name: "replace overlays again",
addDefaults: false,
replaceOverlays: true,
legacyYaml: `
nodeprofiles:
default:
runtime overlay:
- hosts
- ssh.authorized_keys
- syncuser
system overlay:
- wwinit
- wwclient
- fstab
- hostname
- ssh.host_keys
- issue
- resolv
- udev.netname
- systemd.netname
- ifcfg
- NetworkManager
- debian.interfaces
- wicked
- ignition
nodes:
n1:
runtime overlay:
- hosts
- ssh.authorized_keys
- syncuser
system overlay:
- wwinit
- wwclient
- fstab
- hostname
- ssh.host_keys
- issue
- resolv
- udev.netname
- systemd.netname
- ifcfg
- NetworkManager
- debian.interfaces
- wicked
- ignition
`,
upgradedYaml: `
nodeprofiles:
default:
runtime overlay:
- hosts
- ssh.authorized_keys
- syncuser
system overlay:
- wwinit
- wwclient
- fstab
- hostname
- ssh.host_keys
- issue
- resolv
- udev.netname
- systemd.netname
- ifcfg
- NetworkManager
- debian.interfaces
- wicked
- ignition
nodes:
n1:
runtime overlay:
- hosts
- ssh.authorized_keys
- syncuser
system overlay:
- wwinit
- wwclient
- fstab
- hostname
- ssh.host_keys
- issue
- resolv
- udev.netname
- systemd.netname
- ifcfg
- NetworkManager
- debian.interfaces
- wicked
- ignition
`,
},
{