From 135a4d91041b6a02e72a4ecc4b4e9add31595981 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 5 Jun 2018 16:54:32 +0900 Subject: [PATCH] update cri vendor Signed-off-by: Akihiro Suda --- vendor.conf | 3 +-- vendor/github.com/containerd/cri/cli/cli.go | 8 ++++---- .../github.com/containerd/cri/pkg/client/client.go | 8 +++----- vendor/github.com/containerd/cri/vendor.conf | 12 ++++++------ 4 files changed, 14 insertions(+), 17 deletions(-) diff --git a/vendor.conf b/vendor.conf index fcb6532bc..632c6f25a 100644 --- a/vendor.conf +++ b/vendor.conf @@ -43,8 +43,7 @@ github.com/syndtr/gocapability db04d3cc01c8b54962a58ec7e491717d06cfcc16 github.com/gotestyourself/gotestyourself 44dbf532bbf5767611f6f2a61bded572e337010a github.com/google/go-cmp v0.1.0 -# #2135: cri is temporarily forked because of circular dependency. will be fixed immediately in a follow-up PR. -github.com/containerd/cri 6e975823be192ad19f2ce7afcf6c57b88a991c30 https://github.com/AkihiroSuda/cri-containerd.git +github.com/containerd/cri 8bcb9a95394e8d7845da1d6a994d3ac2a86d22f0 github.com/containerd/go-cni f2d7272f12d045b16ed924f50e91f9f9cecc55a7 github.com/blang/semver v3.1.0 github.com/containernetworking/cni v0.6.0 diff --git a/vendor/github.com/containerd/cri/cli/cli.go b/vendor/github.com/containerd/cri/cli/cli.go index 103b1c229..e43180cad 100644 --- a/vendor/github.com/containerd/cri/cli/cli.go +++ b/vendor/github.com/containerd/cri/cli/cli.go @@ -49,16 +49,16 @@ var loadCommand = cli.Command{ timeout = context.GlobalDuration("timeout") cancel gocontext.CancelFunc ) - cl, err := client.NewCRIPluginClient(address, timeout) - if err != nil { - return errors.Wrap(err, "failed to create grpc client") - } if timeout > 0 { ctx, cancel = gocontext.WithTimeout(gocontext.Background(), timeout) } else { ctx, cancel = gocontext.WithCancel(ctx) } defer cancel() + cl, err := client.NewCRIPluginClient(ctx, address) + if err != nil { + return errors.Wrap(err, "failed to create grpc client") + } for _, path := range context.Args() { absPath, err := filepath.Abs(path) if err != nil { diff --git a/vendor/github.com/containerd/cri/pkg/client/client.go b/vendor/github.com/containerd/cri/pkg/client/client.go index c575bcccf..83d605ff9 100644 --- a/vendor/github.com/containerd/cri/pkg/client/client.go +++ b/vendor/github.com/containerd/cri/pkg/client/client.go @@ -17,7 +17,7 @@ limitations under the License. package client import ( - "time" + "context" "github.com/pkg/errors" "google.golang.org/grpc" @@ -28,16 +28,14 @@ import ( // NewCRIPluginClient creates grpc client of cri plugin // TODO(random-liu): Wrap grpc functions. -func NewCRIPluginClient(endpoint string, timeout time.Duration) (api.CRIPluginServiceClient, error) { +func NewCRIPluginClient(ctx context.Context, endpoint string) (api.CRIPluginServiceClient, error) { addr, dialer, err := util.GetAddressAndDialer(endpoint) if err != nil { return nil, errors.Wrap(err, "failed to get dialer") } - conn, err := grpc.Dial(addr, + conn, err := grpc.DialContext(ctx, addr, grpc.WithBlock(), grpc.WithInsecure(), - // TODO(random-liu): WithTimeout is being deprecated, use context instead. - grpc.WithTimeout(timeout), grpc.WithDialer(dialer), ) if err != nil { diff --git a/vendor/github.com/containerd/cri/vendor.conf b/vendor/github.com/containerd/cri/vendor.conf index c20069d51..49d7d2f1c 100644 --- a/vendor/github.com/containerd/cri/vendor.conf +++ b/vendor/github.com/containerd/cri/vendor.conf @@ -4,8 +4,8 @@ github.com/boltdb/bolt e9cf4fae01b5a8ff89d0ec6b32f0d9c9f79aefdd github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895 github.com/containerd/cgroups fe281dd265766145e943a034aa41086474ea6130 github.com/containerd/console cb7008ab3d8359b78c5f464cb7cf160107ad5925 -github.com/containerd/containerd 1f8c612a6c7ef2fc8328c953fb660adce2bf0a80 https://github.com/AkihiroSuda/containerd.git -github.com/containerd/continuity 2d3749b4da569ac97ca63dccba5eee4f5ee2beab +github.com/containerd/containerd 84bebdd91d347c99069d1705b7d4e6d6f746160c +github.com/containerd/continuity d3c23511c1bf5851696cba83143d9cbcd666869b github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c github.com/containerd/go-cni f2d7272f12d045b16ed924f50e91f9f9cecc55a7 github.com/containerd/go-runc f271fa2021de855d4d918dbef83c5fe19db1bdd5 @@ -26,15 +26,15 @@ github.com/godbus/dbus c7fdd8b5cd55e87b4e1f4e372cdb1db61dd6c66f github.com/gogo/googleapis 08a7655d27152912db7aaf4f983275eaf8d128ef github.com/gogo/protobuf v1.0.0 github.com/golang/glog 44145f04b68cf362d9c4df2182967c2275eaefed -github.com/golang/protobuf 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9 +github.com/golang/protobuf v1.1.0 github.com/google/gofuzz 44d81051d367757e1c7c6a5a86423ece9afcf63c github.com/grpc-ecosystem/go-grpc-prometheus 6b7015e65d366bf3f19b2b2a000a831940f0f7e0 github.com/hashicorp/errwrap 7554cd9344cec97297fa6649b055a8c98c2a1e55 github.com/hashicorp/go-multierror ed905158d87462226a13fe39ddf685ea65f1c11f github.com/json-iterator/go 1.0.4 github.com/matttproud/golang_protobuf_extensions v1.0.0 -github.com/Microsoft/go-winio v0.4.5 -github.com/Microsoft/hcsshim v0.6.10 +github.com/Microsoft/go-winio v0.4.7 +github.com/Microsoft/hcsshim v0.6.11 github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7 github.com/opencontainers/image-spec v1.0.1 github.com/opencontainers/runc 69663f0bd4b60df09991c08812a60108003fa340 @@ -62,7 +62,7 @@ golang.org/x/sys 314a259e304ff91bd6985da2a7149bbf91237993 https://github.com/gol golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4 golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944 -google.golang.org/grpc v1.10.1 +google.golang.org/grpc v1.12.0 gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77 k8s.io/api 7e796de92438aede7cb5d6bcf6c10f4fa65db560