From f2273fcd4af05c0ea1df534a09cc59fd8e2cc802 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Fri, 14 Feb 2025 20:45:39 -0700 Subject: [PATCH] Removed check for "discoverable" profiles during `wwctl upgrade nodes` Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 1 + internal/pkg/upgrade/node.go | 7 ++----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecbd249c..77f6779e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -46,6 +46,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Remove redundant `wwctl genconfig completions` command. #1716 - Remove syncuser warning messages in `wwctl` that assume its use. #1321 - Remove syncuser from the list of default runtime overlays. #1322 +- Removed check for "discoverable" profiles during `wwctl upgrade nodes`. ## v4.6.0rc2, 2025-02-07 diff --git a/internal/pkg/upgrade/node.go b/internal/pkg/upgrade/node.go index 99580db0..0fb1522f 100644 --- a/internal/pkg/upgrade/node.go +++ b/internal/pkg/upgrade/node.go @@ -158,7 +158,8 @@ func (legacy *NodesYaml) Upgrade(addDefaults bool, replaceOverlays bool, warewul } type Node struct { - Profile `yaml:"-,inline"` + Discoverable string `yaml:"discoverable,omitempty"` + Profile `yaml:"-,inline"` } func (legacy *Node) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded *node.Node) { @@ -330,7 +331,6 @@ type Profile struct { ImageName string `yaml:"image name,omitempty"` ContainerName string `yaml:"container name,omitempty"` Disabled string `yaml:"disabled,omitempty"` - Discoverable string `yaml:"discoverable,omitempty"` Disks map[string]*Disk `yaml:"disks,omitempty"` FileSystems map[string]*FileSystem `yaml:"filesystems,omitempty"` Init string `yaml:"init,omitempty"` @@ -383,9 +383,6 @@ func (legacy *Profile) Upgrade(addDefaults bool, replaceOverlays bool) (upgraded if legacy.Disabled != "" { logIgnore("Disabled", legacy.Disabled, "obsolete") } - if legacy.Discoverable != "" { - logIgnore("Discoverable", legacy.Discoverable, "invalid for profiles") - } if legacy.Disks != nil { for name, disk := range legacy.Disks { upgraded.Disks[name] = disk.Upgrade()