Recommended changes from review of #1568

- Make Resources an `interface{}` to support arbitrary yaml
- Remove `wwctl resource` as incompatible with arbitrary yaml
- Revert changes to host overlay templates
- Remove NFS mount options from warewulf.conf
- Replace NFS support / resource prefix with "fstab" resource
- Move resources to profiles
- Migrate warewulf.conf mounts to nodes.conf with `wwctl upgrade`
- Add documentation

Signed-off-by: Jonathon Anderson <janderson@ciq.com>
This commit is contained in:
Jonathon Anderson
2025-01-17 01:28:14 -07:00
parent eff1edd038
commit bc52f3b7d7
61 changed files with 344 additions and 843 deletions

View File

@@ -16,6 +16,7 @@ var (
replaceOverlays bool
inputPath string
outputPath string
inputConfPath string
)
func GetCommand() *cobra.Command {
@@ -31,6 +32,7 @@ supported by the current version.`,
command.Flags().BoolVar(&replaceOverlays, "replace-overlays", false, "Replace 'wwinit' and 'generic' overlays with their split replacements")
command.Flags().StringVarP(&inputPath, "input-path", "i", "", "Path to a legacy nodes.conf")
command.Flags().StringVarP(&outputPath, "output-path", "o", "", "Path to write the upgraded nodes.conf to")
command.Flags().StringVar(&inputConfPath, "with-warewulfconf", config.ConfigFile, "Path to a legacy warewulf.conf")
if err := command.MarkFlagRequired("add-defaults"); err != nil {
panic(err)
}
@@ -49,6 +51,16 @@ func UpgradeNodesConf(cmd *cobra.Command, args []string) error {
if outputPath == "" {
outputPath = config.Get().Paths.NodesConf()
}
confData, err := os.ReadFile(inputConfPath)
if err != nil {
return err
}
warewulfConf, err := upgrade.ParseConfig(confData)
if err != nil {
return err
}
data, err := os.ReadFile(inputPath)
if err != nil {
return err
@@ -57,7 +69,7 @@ func UpgradeNodesConf(cmd *cobra.Command, args []string) error {
if err != nil {
return err
}
upgraded := legacy.Upgrade(addDefaults, replaceOverlays)
upgraded := legacy.Upgrade(addDefaults, replaceOverlays, warewulfConf)
if outputPath == "-" {
upgradedYaml, err := upgraded.Dump()
if err != nil {