diff --git a/go.mod b/go.mod index 6e3a43c9d1044..b9408d3773f1d 100644 --- a/go.mod +++ b/go.mod @@ -35,11 +35,11 @@ require ( github.com/spf13/cobra v1.10.2 github.com/spf13/pflag v1.0.10 go.opencensus.io v0.24.0 + go.yaml.in/yaml/v3 v3.0.4 golang.org/x/tools v0.48.0 google.golang.org/grpc v1.83.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.6.2 google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af - gopkg.in/yaml.v2 v2.4.0 helm.sh/helm/v3 v3.21.3 k8s.io/api v0.36.3 k8s.io/apiextensions-apiserver v0.36.3 @@ -133,7 +133,6 @@ require ( go.opentelemetry.io/otel v1.44.0 // indirect go.opentelemetry.io/otel/trace v1.44.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.54.0 // indirect golang.org/x/mod v0.38.0 // indirect golang.org/x/oauth2 v0.36.0 // indirect diff --git a/testutil/test_data_diff.go b/testutil/test_data_diff.go index b3acb2dd5c7d8..d3725913a291e 100644 --- a/testutil/test_data_diff.go +++ b/testutil/test_data_diff.go @@ -12,7 +12,7 @@ import ( "github.com/go-test/deep" "github.com/sergi/go-diff/diffmatchpatch" - "gopkg.in/yaml.v2" + "go.yaml.in/yaml/v3" ) // TestDataDiffer holds configuration for generating test diff diff --git a/viz/metrics-api/grpc_server.go b/viz/metrics-api/grpc_server.go index 5a30f7a7a6a13..0da71b81702e0 100644 --- a/viz/metrics-api/grpc_server.go +++ b/viz/metrics-api/grpc_server.go @@ -14,8 +14,8 @@ import ( "github.com/linkerd/linkerd2/viz/metrics-api/util" promv1 "github.com/prometheus/client_golang/api/prometheus/v1" log "github.com/sirupsen/logrus" + "go.yaml.in/yaml/v3" "google.golang.org/grpc" - "gopkg.in/yaml.v2" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/labels" ) @@ -56,7 +56,6 @@ func NewGrpcServer( clusterDomain string, ignoredNamespaces []string, ) *grpc.Server { - server := &grpcServer{ prometheusAPI: promAPI, k8sAPI: k8sAPI,