From 4c8a07f1dc5aac000c1965cb3bb1e9868b7eefd0 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Wed, 20 Dec 2023 15:41:02 +0100 Subject: [PATCH] changes for yaml/v3 for wwctl commands Signed-off-by: Christian Goll --- internal/app/wwctl/genconf/warewulfconf/print/main.go | 2 +- internal/app/wwctl/node/add/main.go | 2 +- internal/app/wwctl/node/edit/main.go | 2 +- internal/app/wwctl/node/imprt/main.go | 2 +- internal/app/wwctl/node/set/main.go | 2 +- internal/app/wwctl/profile/add/main.go | 2 +- internal/app/wwctl/profile/edit/main.go | 2 +- internal/app/wwctl/profile/set/main.go | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/internal/app/wwctl/genconf/warewulfconf/print/main.go b/internal/app/wwctl/genconf/warewulfconf/print/main.go index 8d919f55..73c7405d 100644 --- a/internal/app/wwctl/genconf/warewulfconf/print/main.go +++ b/internal/app/wwctl/genconf/warewulfconf/print/main.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" warewulfconf "github.com/warewulf/warewulf/internal/pkg/config" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func CobraRunE(cmd *cobra.Command, args []string) (err error) { diff --git a/internal/app/wwctl/node/add/main.go b/internal/app/wwctl/node/add/main.go index 4a7bf298..55041457 100644 --- a/internal/app/wwctl/node/add/main.go +++ b/internal/app/wwctl/node/add/main.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/spf13/cobra" apinode "github.com/warewulf/warewulf/internal/pkg/api/node" diff --git a/internal/app/wwctl/node/edit/main.go b/internal/app/wwctl/node/edit/main.go index a4db3d5a..dbc80d09 100644 --- a/internal/app/wwctl/node/edit/main.go +++ b/internal/app/wwctl/node/edit/main.go @@ -17,7 +17,7 @@ import ( "github.com/warewulf/warewulf/internal/pkg/util" "github.com/warewulf/warewulf/internal/pkg/warewulfd" "github.com/warewulf/warewulf/internal/pkg/wwlog" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func CobraRunE(cmd *cobra.Command, args []string) error { diff --git a/internal/app/wwctl/node/imprt/main.go b/internal/app/wwctl/node/imprt/main.go index 6ba9b793..349a8cb5 100644 --- a/internal/app/wwctl/node/imprt/main.go +++ b/internal/app/wwctl/node/imprt/main.go @@ -13,7 +13,7 @@ import ( apiutil "github.com/warewulf/warewulf/internal/pkg/api/util" "github.com/warewulf/warewulf/internal/pkg/node" "github.com/warewulf/warewulf/internal/pkg/wwlog" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func CobraRunE(cmd *cobra.Command, args []string) error { diff --git a/internal/app/wwctl/node/set/main.go b/internal/app/wwctl/node/set/main.go index 93ade466..1d9bebe7 100644 --- a/internal/app/wwctl/node/set/main.go +++ b/internal/app/wwctl/node/set/main.go @@ -11,7 +11,7 @@ import ( "github.com/warewulf/warewulf/internal/pkg/hostlist" "github.com/warewulf/warewulf/internal/pkg/node" "github.com/warewulf/warewulf/internal/pkg/wwlog" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err error) { diff --git a/internal/app/wwctl/profile/add/main.go b/internal/app/wwctl/profile/add/main.go index 80e7e3ad..319860f8 100644 --- a/internal/app/wwctl/profile/add/main.go +++ b/internal/app/wwctl/profile/add/main.go @@ -7,7 +7,7 @@ import ( apiprofile "github.com/warewulf/warewulf/internal/pkg/api/profile" "github.com/warewulf/warewulf/internal/pkg/node" "github.com/warewulf/warewulf/internal/pkg/wwlog" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" "github.com/spf13/cobra" "github.com/warewulf/warewulf/internal/pkg/api/routes/wwapiv1" diff --git a/internal/app/wwctl/profile/edit/main.go b/internal/app/wwctl/profile/edit/main.go index ab1f5551..d8d2a517 100644 --- a/internal/app/wwctl/profile/edit/main.go +++ b/internal/app/wwctl/profile/edit/main.go @@ -17,7 +17,7 @@ import ( "github.com/warewulf/warewulf/internal/pkg/node" "github.com/warewulf/warewulf/internal/pkg/util" "github.com/warewulf/warewulf/internal/pkg/wwlog" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func CobraRunE(cmd *cobra.Command, args []string) error { diff --git a/internal/app/wwctl/profile/set/main.go b/internal/app/wwctl/profile/set/main.go index 17edaafa..b3db362c 100644 --- a/internal/app/wwctl/profile/set/main.go +++ b/internal/app/wwctl/profile/set/main.go @@ -11,7 +11,7 @@ import ( "github.com/warewulf/warewulf/internal/pkg/api/util" "github.com/warewulf/warewulf/internal/pkg/node" "github.com/warewulf/warewulf/internal/pkg/wwlog" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) func CobraRunE(vars *variables) func(cmd *cobra.Command, args []string) (err error) {