From 8d9ff04d10d6fed57f566a8a87ae819e42390645 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Tue, 27 Feb 2024 11:56:07 +0100 Subject: [PATCH] vendor update gopkg.in/yaml.v2 to v3 There is no reason for us to use v2 here, we use v3 already in most places. The go-openapi dependency still uses v2 so we do not get rid of it yet but it looks like they migrated upstream so once a new version is released there and finds our way to us then we should get some nice binary size reduction. [NO NEW TESTS NEEDED] Signed-off-by: Paul Holzinger --- cmd/podman/machine/info.go | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/podman/machine/info.go b/cmd/podman/machine/info.go index 8c3d5f727a..072c639fcb 100644 --- a/cmd/podman/machine/info.go +++ b/cmd/podman/machine/info.go @@ -18,7 +18,7 @@ import ( machineDefine "github.com/containers/podman/v5/pkg/machine/define" "github.com/containers/podman/v5/pkg/machine/vmconfigs" "github.com/spf13/cobra" - "gopkg.in/yaml.v2" + "gopkg.in/yaml.v3" ) var infoDescription = `Display information pertaining to the machine host.` diff --git a/go.mod b/go.mod index 5b7e1143c9..d05a779c11 100644 --- a/go.mod +++ b/go.mod @@ -77,7 +77,6 @@ require ( golang.org/x/text v0.14.0 google.golang.org/protobuf v1.32.0 gopkg.in/inf.v0 v0.9.1 - gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/kubernetes v1.28.4 sigs.k8s.io/yaml v1.4.0 @@ -222,6 +221,7 @@ require ( gopkg.in/go-jose/go-jose.v2 v2.6.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect tags.cncf.io/container-device-interface/specs-go v0.6.0 // indirect )