Skip to content
This repository was archived by the owner on Mar 9, 2022. It is now read-only.

Commit 69a876d

Browse files
Random-LiuRandom-Liu
authored
Merge pull request #1305 from Random-Liu/sync-vendor-release-1.2
[release/1.2] Sync vendors with containerd.
2 parents bab7348 + b638ad9 commit 69a876d

169 files changed

Lines changed: 10393 additions & 5930 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎pkg/client/client.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ package client
1818

1919
import (
2020
"context"
21+
"net"
22+
"time"
2123

2224
"github.com/pkg/errors"
2325
"google.golang.org/grpc"
@@ -36,7 +38,14 @@ func NewCRIPluginClient(ctx context.Context, endpoint string) (api.CRIPluginServ
3638
conn, err := grpc.DialContext(ctx, addr,
3739
grpc.WithBlock(),
3840
grpc.WithInsecure(),
39-
grpc.WithDialer(dialer),
41+
grpc.WithContextDialer(
42+
func(ctx context.Context, addr string) (net.Conn, error) {
43+
if deadline, ok := ctx.Deadline(); ok {
44+
return dialer(addr, time.Until(deadline))
45+
}
46+
return dialer(addr, 0)
47+
},
48+
),
4049
)
4150
if err != nil {
4251
return nil, errors.Wrap(err, "failed to dial")

‎vendor.conf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ github.com/blang/semver v3.1.0
33
github.com/BurntSushi/toml a368813c5e648fee92e5f6c30e3944ff9d5e8895
44
github.com/containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
55
github.com/containerd/console c12b1e7919c14469339a5d38f2f8ed9b64a9de23
6-
github.com/containerd/containerd v1.2.6
6+
github.com/containerd/containerd v1.2.10
77
github.com/containerd/continuity bd77b46c8352f74eb12c85bdc01f4b90f69d66b4
88
github.com/containerd/fifo 3d5202aec260678c48179c56f40e6f38a095738c
99
github.com/containerd/go-cni 40bcf8ec8acd7372be1d77031d585d5d8e561c90
10-
github.com/containerd/go-runc 5a6d9f37cfa36b15efba46dc7ea349fa9b7143c3
11-
github.com/containerd/ttrpc 2a805f71863501300ae1976d29f0454ae003e85a
10+
github.com/containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
11+
github.com/containerd/ttrpc 92c8520ef9f86600c650dd540266a007bf03670f
1212
github.com/containerd/typeurl a93fcdb778cd272c6e9b3028b2f42d813e785d40
1313
github.com/containernetworking/cni v0.6.0
1414
github.com/containernetworking/plugins v0.7.5
@@ -39,10 +39,10 @@ github.com/modern-go/concurrent 1.0.3
3939
github.com/modern-go/reflect2 1.0.1
4040
github.com/opencontainers/go-digest c9281466c8b2f606084ac71339773efd177436e7
4141
github.com/opencontainers/image-spec v1.0.1
42-
github.com/opencontainers/runc 029124da7af7360afa781a0234d1b083550f797c
42+
github.com/opencontainers/runc 3e425f80a8c931f88e6d94a8c831b9d5aa481657
4343
github.com/opencontainers/runtime-spec eba862dc2470385a233c7507392675cbeadf7353
4444
github.com/opencontainers/runtime-tools v0.6.0
45-
github.com/opencontainers/selinux v1.2.1
45+
github.com/opencontainers/selinux v1.2.2
4646
github.com/pkg/errors v0.8.0
4747
github.com/pmezard/go-difflib v1.0.0
4848
github.com/prometheus/client_golang f4fb1b73fb099f396a7f0036bf86aa8def4ed823
@@ -67,7 +67,7 @@ golang.org/x/sys 41f3e6584952bb034a481797859f6ab34b6803bd https://github.com/gol
6767
golang.org/x/text 19e51611da83d6be54ddafce4a4af510cb3e9ea4
6868
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
6969
google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944
70-
google.golang.org/grpc v1.12.0
70+
google.golang.org/grpc 6eaf6f47437a6b4e2153a190160ef39a92c7eceb
7171
gopkg.in/inf.v0 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4
7272
gopkg.in/yaml.v2 53feefa2559fb8dfa8d81baad31be332c97d6c77
7373
k8s.io/api kubernetes-1.12.0

‎vendor/github.com/containerd/containerd/api/types/descriptor.pb.go‎

Lines changed: 175 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/api/types/descriptor.proto‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/archive/tar.go‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/client.go‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/cmd/containerd/command/publish.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/cmd/ctr/commands/run/run.go‎

Lines changed: 1 addition & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/containerd/cmd/ctr/commands/run/run_unix.go‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)