From 1bbee573af72ee63ec67483a836f6e5cdcf9850d Mon Sep 17 00:00:00 2001 From: Kazuyoshi Kato Date: Wed, 16 Jun 2021 12:17:18 -0700 Subject: [PATCH] github.com/golang/protobuf/proto is deprecated Signed-off-by: Kazuyoshi Kato --- go.mod | 2 +- pkg/cri/server/container_update_resources_linux_test.go | 2 +- vendor/modules.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7ac63fbf6..8beefed4f 100644 --- a/go.mod +++ b/go.mod @@ -28,7 +28,6 @@ require ( github.com/fsnotify/fsnotify v1.4.9 github.com/gogo/googleapis v1.4.0 github.com/gogo/protobuf v1.3.2 - github.com/golang/protobuf v1.4.3 github.com/google/go-cmp v0.5.4 github.com/google/uuid v1.2.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 @@ -57,6 +56,7 @@ require ( golang.org/x/sync v0.0.0-20201207232520-09787c993a3a golang.org/x/sys v0.0.0-20210426230700-d19ff857e887 google.golang.org/grpc v1.38.0 + google.golang.org/protobuf v1.25.0 gotest.tools/v3 v3.0.3 k8s.io/api v0.20.6 k8s.io/apimachinery v0.20.6 diff --git a/pkg/cri/server/container_update_resources_linux_test.go b/pkg/cri/server/container_update_resources_linux_test.go index ffbc3f88f..90fb6e36a 100644 --- a/pkg/cri/server/container_update_resources_linux_test.go +++ b/pkg/cri/server/container_update_resources_linux_test.go @@ -20,9 +20,9 @@ import ( "context" "testing" - "github.com/golang/protobuf/proto" runtimespec "github.com/opencontainers/runtime-spec/specs-go" "github.com/stretchr/testify/assert" + "google.golang.org/protobuf/proto" runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2" ) diff --git a/vendor/modules.txt b/vendor/modules.txt index 22ef39e20..ec2473a3a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -203,7 +203,6 @@ github.com/gogo/protobuf/vanity/command # github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e github.com/golang/groupcache/lru # github.com/golang/protobuf v1.4.3 -## explicit github.com/golang/protobuf/proto github.com/golang/protobuf/ptypes github.com/golang/protobuf/ptypes/any @@ -448,6 +447,7 @@ google.golang.org/grpc/stats google.golang.org/grpc/status google.golang.org/grpc/tap # google.golang.org/protobuf v1.25.0 +## explicit google.golang.org/protobuf/encoding/prototext google.golang.org/protobuf/encoding/protowire google.golang.org/protobuf/internal/descfmt