kelvin/warewulf
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove wwctl overlay build --host #1419

Browse Source 
Remove the ability to "build" the host overlay with `wwctl overlay
build`. This also obsoletes the `--nodes` flag, which is also removed.

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2024-11-24 22:48:19 -07:00
parent 470fb323eb
commit eace23802f
3 changed files with 14 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
internal/app/wwctl/overlay/build/main.go
View File

@@ -3,20 +3,16 @@ package build
import (
"errors"
"fmt"
"os"
"strings"
"syscall"
"github.com/spf13/cobra"
warewulfconf "github.com/warewulf/warewulf/internal/pkg/config"
"github.com/warewulf/warewulf/internal/pkg/hostlist"
"github.com/warewulf/warewulf/internal/pkg/node"
"github.com/warewulf/warewulf/internal/pkg/overlay"
"github.com/warewulf/warewulf/internal/pkg/wwlog"
)
func CobraRunE(cmd *cobra.Command, args []string) error {
controller := warewulfconf.Get()
nodeDB, err := node.New()
if err != nil {
return fmt.Errorf("could not open node configuration: %s", err)
@@ -54,43 +50,29 @@ func CobraRunE(cmd *cobra.Command, args []string) error {
if len(args) > 0 {
if len(db) != 1 {
return errors.New("nust specify one node to build overlay")
return errors.New("must specify one node to build overlay")
}
for _, node := range db {
return overlay.BuildOverlayIndir(node, OverlayNames, OverlayDir)
}
} else {
// TODO this seems different than what is set in BuildHostOverlay
hostname, _ := os.Hostname()
node := node.NewNode(hostname)
wwlog.Info("building overlay for host: %s", hostname)
return overlay.BuildOverlayIndir(node, OverlayNames, OverlayDir)
return errors.New("must specify a node to build overlay")
}
}
if BuildHost && controller.Warewulf.EnableHostOverlay() {
err := overlay.BuildHostOverlay()
if err != nil {
return fmt.Errorf("host overlay could not be built: %s", err)
}
oldMask := syscall.Umask(007)
defer syscall.Umask(oldMask)
if len(OverlayNames) > 0 {
err = overlay.BuildSpecificOverlays(db, OverlayNames)
} else {
err = overlay.BuildAllOverlays(db)
}
if BuildNodes || (!BuildHost && !BuildNodes) {
oldMask := syscall.Umask(007)
defer syscall.Umask(oldMask)
if len(OverlayNames) > 0 {
err = overlay.BuildSpecificOverlays(db, OverlayNames)
} else {
err = overlay.BuildAllOverlays(db)
}
if err != nil {
return fmt.Errorf("some overlays failed to be generated: %s", err)
}
if err != nil {
return fmt.Errorf("some overlays failed to be generated: %s", err)
}
return nil
}

6
internal/app/wwctl/overlay/build/root.go
View File

@@ -29,15 +29,11 @@ var (
return node_names, cobra.ShellCompDirectiveNoFileComp
},
}
BuildHost bool
BuildNodes bool
OverlayNames []string
OverlayDir string
)
func init() {
baseCmd.PersistentFlags().BoolVarP(&BuildHost, "host", "H", false, "Build overlays only for the host")
baseCmd.PersistentFlags().BoolVarP(&BuildNodes, "nodes", "N", false, "Build overlays only for the nodes")
baseCmd.PersistentFlags().StringSliceVarP(&OverlayNames, "overlay", "O", []string{}, "Build only specific overlay(s)")
if err := baseCmd.RegisterFlagCompletionFunc("overlay", func(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
@@ -46,7 +42,7 @@ func init() {
}); err != nil {
log.Println(err)
}
baseCmd.PersistentFlags().StringVarP(&OverlayDir, "output", "o", "", `Do not create an overlay image, for distribution but write to
baseCmd.PersistentFlags().StringVarP(&OverlayDir, "output", "o", "", `Do not create an overlay image for distribution but write to
the given directory. An overlay must also be ge given to use this option.`)
}