From 17036a6e1dd051dd69e42950de3738e04d0dd5b1 Mon Sep 17 00:00:00 2001 From: Ville Vesilehto Date: Mon, 6 Apr 2026 13:18:47 +0300 Subject: [PATCH] chore(deps): migrate to go.yaml.in/yaml/v2 gopkg.in/yaml.v2 is deprecated. Replace all direct imports with go.yaml.in/yaml/v2 v2.4.4, which is the same code under the supported new module path. The old module path remains as an indirect dependency of transitive deps. Signed-off-by: Ville Vesilehto --- go.mod | 4 ++-- hack/gen-docs/main.go | 2 +- pkg/kubectl-argo-rollouts/cmd/lint/lint.go | 2 +- test/e2e/step_plugin_test.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 63345e0317..6e269e4f80 100644 --- a/go.mod +++ b/go.mod @@ -37,12 +37,12 @@ require ( github.com/stretchr/testify v1.11.1 github.com/tj/assert v0.0.3 github.com/valyala/fasttemplate v1.2.2 + go.yaml.in/yaml/v2 v2.4.4 golang.org/x/oauth2 v0.36.0 golang.org/x/sync v0.20.0 google.golang.org/genproto/googleapis/api v0.0.0-20251202230838-ff82c1b0f217 google.golang.org/grpc v1.79.3 google.golang.org/protobuf v1.36.11 - gopkg.in/yaml.v2 v2.4.0 k8s.io/api v0.34.5 k8s.io/apiextensions-apiserver v0.34.5 k8s.io/apimachinery v0.34.5 @@ -179,7 +179,6 @@ require ( go.opentelemetry.io/otel v1.39.0 // indirect go.opentelemetry.io/otel/metric v1.39.0 // indirect go.opentelemetry.io/otel/trace v1.39.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.49.0 // indirect golang.org/x/mod v0.33.0 // indirect @@ -199,6 +198,7 @@ require ( gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/sourcemap.v1 v1.0.5 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/component-helpers v0.34.5 // indirect k8s.io/controller-manager v0.34.5 // indirect diff --git a/hack/gen-docs/main.go b/hack/gen-docs/main.go index 97a1652e0c..687ee696de 100644 --- a/hack/gen-docs/main.go +++ b/hack/gen-docs/main.go @@ -10,7 +10,7 @@ import ( "sort" "strings" - "gopkg.in/yaml.v2" + "go.yaml.in/yaml/v2" "github.com/argoproj/notifications-engine/pkg/docs" "github.com/spf13/cobra" diff --git a/pkg/kubectl-argo-rollouts/cmd/lint/lint.go b/pkg/kubectl-argo-rollouts/cmd/lint/lint.go index 8043dd848e..d824026638 100644 --- a/pkg/kubectl-argo-rollouts/cmd/lint/lint.go +++ b/pkg/kubectl-argo-rollouts/cmd/lint/lint.go @@ -7,7 +7,7 @@ import ( "os" "github.com/spf13/cobra" - goyaml "gopkg.in/yaml.v2" + goyaml "go.yaml.in/yaml/v2" v1 "k8s.io/api/core/v1" extensionsv1beta1 "k8s.io/api/extensions/v1beta1" networkingv1 "k8s.io/api/networking/v1" diff --git a/test/e2e/step_plugin_test.go b/test/e2e/step_plugin_test.go index 5a938f3f51..1f1ee74a0b 100644 --- a/test/e2e/step_plugin_test.go +++ b/test/e2e/step_plugin_test.go @@ -10,7 +10,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/tj/assert" - "gopkg.in/yaml.v2" + "go.yaml.in/yaml/v2" "github.com/argoproj/argo-rollouts/pkg/apis/rollouts/v1alpha1" "github.com/argoproj/argo-rollouts/test/fixtures"