diff --git a/CHANGELOG.md b/CHANGELOG.md index 1a698b5a..be186597 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,6 +53,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix panic when getting a long container list before building the container. #1391 - Return non-zero exit code on power sub-commands #1439 - Fix issue that pattern matching broken on `node set` #964 +- Fix issue that domain globs not supported during wwctl node delete. #1449 ## v4.5.8, 2024-10-01 diff --git a/internal/pkg/api/node/node.go b/internal/pkg/api/node/node.go index ca68daa0..822432c4 100644 --- a/internal/pkg/api/node/node.go +++ b/internal/pkg/api/node/node.go @@ -158,19 +158,7 @@ func NodeDeleteParameterCheck(ndp *wwapiv1.NodeDeleteParameter, console bool) (n node_args := hostlist.Expand(ndp.NodeNames) - for _, r := range node_args { - var match bool - for _, n := range nodes { - if n.Id.Get() == r { - nodeList = append(nodeList, n) - match = true - } - } - - if !match { - wwlog.Error("ERROR: No match for node: %s\n", r) - } - } + nodeList = node.FilterByName(nodes, node_args) if len(nodeList) == 0 { wwlog.Info("No nodes found")