From e15e0af3463c2cdd935dcc42fdf8afbfea5db0be Mon Sep 17 00:00:00 2001 From: Xun Jiang Date: Thu, 4 Jun 2026 15:26:14 +0800 Subject: [PATCH] Replace gopkg.in/yaml.v3 by go.yaml.in/yaml/v3 Signed-off-by: Xun Jiang --- go.mod | 4 ++-- internal/resourcepolicies/volume_resources.go | 2 +- internal/resourcepolicies/volume_resources_validator.go | 2 +- test/util/report/report.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 3648ed027..94d6c97d4 100644 --- a/go.mod +++ b/go.mod @@ -43,6 +43,7 @@ require ( github.com/stretchr/testify v1.11.1 github.com/vmware-tanzu/crash-diagnostics v0.4.3 go.uber.org/zap v1.28.0 + go.yaml.in/yaml/v3 v3.0.4 golang.org/x/mod v0.35.0 golang.org/x/oauth2 v0.36.0 golang.org/x/sys v0.45.0 @@ -50,7 +51,6 @@ require ( google.golang.org/api v0.283.0 google.golang.org/grpc v1.81.1 google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af - gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.36.0 k8s.io/apiextensions-apiserver v0.36.0 k8s.io/apimachinery v0.36.0 @@ -193,7 +193,6 @@ require ( go.starlark.net v0.0.0-20241226192728-8dfa5b98479f // indirect go.uber.org/multierr v1.11.0 // indirect go.yaml.in/yaml/v2 v2.4.4 // indirect - go.yaml.in/yaml/v3 v3.0.4 // indirect golang.org/x/crypto v0.51.0 // indirect golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f // indirect golang.org/x/net v0.55.0 // indirect @@ -207,6 +206,7 @@ require ( google.golang.org/genproto/googleapis/rpc v0.0.0-20260523011958-0a33c5d7ca68 // indirect gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/kube-openapi v0.0.0-20260317180543-43fb72c5454a // indirect k8s.io/streaming v0.36.0 // indirect sigs.k8s.io/randfill v1.0.0 // indirect diff --git a/internal/resourcepolicies/volume_resources.go b/internal/resourcepolicies/volume_resources.go index 4ad34f484..9698403e4 100644 --- a/internal/resourcepolicies/volume_resources.go +++ b/internal/resourcepolicies/volume_resources.go @@ -23,7 +23,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "github.com/pkg/errors" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" corev1api "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" ) diff --git a/internal/resourcepolicies/volume_resources_validator.go b/internal/resourcepolicies/volume_resources_validator.go index 652c41d30..0dae961fa 100644 --- a/internal/resourcepolicies/volume_resources_validator.go +++ b/internal/resourcepolicies/volume_resources_validator.go @@ -20,7 +20,7 @@ import ( "io" "github.com/pkg/errors" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" ) const currentSupportDataVersion = "v1" diff --git a/test/util/report/report.go b/test/util/report/report.go index 6d5955392..183b94e98 100644 --- a/test/util/report/report.go +++ b/test/util/report/report.go @@ -20,7 +20,7 @@ import ( "os" "github.com/pkg/errors" - "gopkg.in/yaml.v3" + "go.yaml.in/yaml/v3" "github.com/vmware-tanzu/velero/test" )