From 279e966ce23f8cb6f7d33f4e640403c2949db2b3 Mon Sep 17 00:00:00 2001 From: Jonathon Anderson Date: Thu, 20 Feb 2025 01:35:10 -0700 Subject: [PATCH] Reduced default verbosity of `wwctl overlay build` Signed-off-by: Jonathon Anderson --- CHANGELOG.md | 1 + internal/pkg/overlay/overlay.go | 13 ++++++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 76fec2bc..4006da0c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,6 +38,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Added logging to wwinit scripts. #1156 - Renamed /warewulf/wwinit to /warewulf/prescripts. #1156 - Display auto-detected kernel version during iPXE and GRUB. #1742 +- Reduced default verbosity of `wwctl overlay build`. ### Fixed diff --git a/internal/pkg/overlay/overlay.go b/internal/pkg/overlay/overlay.go index 0bca2140..3b76ae4f 100644 --- a/internal/pkg/overlay/overlay.go +++ b/internal/pkg/overlay/overlay.go @@ -108,12 +108,14 @@ func BuildAllOverlays(nodes []node.Node, allNodes []node.Node, workerCount int) var wg sync.WaitGroup worker := func() { for n := range nodeChan { - wwlog.Info("Building system overlays for %s: [%s]", n.Id(), strings.Join(n.SystemOverlay, ", ")) + wwlog.Info("Building system overlay image for %s", n.Id()) + wwlog.Debug("System overlays for %s: [%s]", n.Id(), strings.Join(n.SystemOverlay, ", ")) if err := BuildOverlay(n, allNodes, "system", n.SystemOverlay); err != nil { errChan <- fmt.Errorf("could not build system overlays %v for node %s: %w", n.SystemOverlay, n.Id(), err) } - wwlog.Info("Building runtime overlays for %s: [%s]", n.Id(), strings.Join(n.RuntimeOverlay, ", ")) + wwlog.Info("Building runtime overlay image for %s", n.Id()) + wwlog.Debug("Runtime overlays for %s: [%s]", n.Id(), strings.Join(n.RuntimeOverlay, ", ")) if err := BuildOverlay(n, allNodes, "runtime", n.RuntimeOverlay); err != nil { errChan <- fmt.Errorf("could not build runtime overlays %v for node %s: %w", n.RuntimeOverlay, n.Id(), err) } @@ -239,7 +241,12 @@ func BuildOverlay(nodeConf node.Node, allNodes []node.Node, context string, over } // create the dir where the overlay images will reside - name := fmt.Sprintf("overlay %s/%v", nodeConf.Id(), overlayNames) + var name string + if context != "" { + name = fmt.Sprintf("%s %s overlay", nodeConf.Id(), context) + } else { + name = fmt.Sprintf("%s overlay/%v", nodeConf.Id(), overlayNames) + } overlayImage := OverlayImage(nodeConf.Id(), context, overlayNames) overlayImageDir := path.Dir(overlayImage)