X Tutup
Skip to content

Commit 124fc14

Browse files
authored
Merge pull request containerd#4926 from dims/update-k8s-to-latest-v1.20.x
Update k8s to latest v1.20.x
2 parents 32506bd + 378c119 commit 124fc14

File tree

142 files changed

+31291
-3117
lines changed

Some content is hidden

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

142 files changed

+31291
-3117
lines changed

go.mod

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ require (
3131
github.com/gogo/googleapis v1.4.0
3232
github.com/gogo/protobuf v1.3.1
3333
github.com/golang/protobuf v1.4.3
34-
github.com/google/go-cmp v0.5.1
35-
github.com/google/uuid v1.1.1
34+
github.com/google/go-cmp v0.5.2
35+
github.com/google/uuid v1.1.2
3636
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
3737
github.com/hashicorp/go-multierror v1.0.0
3838
github.com/imdario/mergo v0.3.10
@@ -47,24 +47,24 @@ require (
4747
github.com/pkg/errors v0.9.1
4848
github.com/prometheus/client_golang v1.7.1
4949
github.com/sirupsen/logrus v1.7.0
50-
github.com/stretchr/testify v1.4.0
50+
github.com/stretchr/testify v1.6.1
5151
github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2
5252
github.com/tchap/go-patricia v2.2.6+incompatible
5353
github.com/urfave/cli v1.22.2
5454
go.etcd.io/bbolt v1.3.5
55-
golang.org/x/net v0.0.0-20200707034311-ab3426394381
55+
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
5656
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
5757
golang.org/x/sys v0.0.0-20201202213521-69691e467435
5858
google.golang.org/grpc v1.30.0
5959
gotest.tools/v3 v3.0.2
60-
k8s.io/api v0.19.4
61-
k8s.io/apimachinery v0.19.4
62-
k8s.io/apiserver v0.19.4
63-
k8s.io/client-go v0.19.4
64-
k8s.io/component-base v0.19.4
65-
k8s.io/cri-api v0.20.0-beta.1.0.20201105173512-3990421b69a0
66-
k8s.io/klog/v2 v2.2.0
67-
k8s.io/utils v0.0.0-20200729134348-d5654de09c73
60+
k8s.io/api v0.20.1
61+
k8s.io/apimachinery v0.20.1
62+
k8s.io/apiserver v0.20.1
63+
k8s.io/client-go v0.20.1
64+
k8s.io/component-base v0.20.1
65+
k8s.io/cri-api v0.20.1
66+
k8s.io/klog/v2 v2.4.0
67+
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
6868
)
6969

7070
replace (

go.sum

Lines changed: 125 additions & 47 deletions
Large diffs are not rendered by default.

vendor/github.com/google/go-cmp/cmp/compare.go

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

vendor/github.com/google/go-cmp/cmp/options.go

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

vendor/github.com/google/uuid/README.md

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

vendor/github.com/google/uuid/marshal.go

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

vendor/github.com/google/uuid/version1.go

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

vendor/github.com/google/uuid/version4.go

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

vendor/github.com/prometheus/procfs/CODE_OF_CONDUCT.md

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

vendor/github.com/prometheus/procfs/cpuinfo.go

Lines changed: 44 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)
X Tutup