Commit Graph

78 Commits

Author SHA1 Message Date
Kazuyoshi Kato
1bbee573af github.com/golang/protobuf/proto is deprecated
Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-06-17 10:28:48 -04:00
Kazuyoshi Kato
91c8fa4529 Update github.com/golang/protobuf from v1.3.5 to v1.4.3
google.golang.org/grpc doesn't work with protobuf v1.3.5.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-06-17 10:28:48 -04:00
Kazuyoshi Kato
b7e79dc5ab Update google.golang.org/grpc from v1.27.1 to v1.38.0
v1.38.0 is used by Kubernetes since
https://github.com/kubernetes/kubernetes/pull/100488.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-06-17 10:28:48 -04:00
Davanum Srinivas
9a451d103c Update opencontainers/selinux to v1.8.2
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-06-03 10:35:11 -04:00
Priyanka Saggu
ec28288f45 bump runc version to v1.0.0-rc95
Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>
2021-05-19 17:24:56 +05:30
Akihiro Suda
e9a7b6a7ae Merge pull request #5508 from dims/bump-go-winio-to-0.5.0
Bump github.com/Microsoft/go-winio from 0.4.15 to 0.5.0
2021-05-19 15:49:01 +09:00
Davanum Srinivas
5dbae87c59 Bump github.com/Microsoft/go-winio from 0.4.15 to 0.5.0
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-05-18 11:11:11 -04:00
Davanum Srinivas
1093f05ab2 Bump github.com/opencontainers/selinux from 1.8.0 to 1.8.1
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-05-18 11:08:04 -04:00
Priyanka Saggu
b6a2517491 bump hcsshim version to v0.8.17
Signed-off-by: Priyanka Saggu <priyankasaggu11929@gmail.com>
2021-05-16 01:38:43 +05:30
Davanum Srinivas
de6db4038c Update vendored runc to v1.0.0.0-rc94
Note that this is the code in containerd that uses runc (as almost
a library). Please see the other commit for the update to runc binary
itself.

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-05-10 13:12:48 -04:00
Akihiro Suda
c27cbc6617 Merge pull request #5436 from bwh-mind/ppc32
Update golang.org/x/sys to add linux/ppc support
2021-05-05 01:14:22 +09:00
Ben Hutchings
b538d8f1a1 Update golang.org/x/sys to add linux/ppc support
This package as recently updated to add support for Linux on
32-bit PowerPC (ppc), implemented by gccgo.

Signed-off-by: Ben Hutchings <ben.hutchings@essensium.com>
2021-05-03 00:48:09 +02:00
Sebastiaan van Stijn
e26fc84729 go.mod: cut circular dependency on github.com/containerd/containerd
This forces vendoring to only take dependencies of this repository to
be taken into account, effectively cutting the circular dependency (for
the vendored code), and to prevent depending on transitive dependencies
coming from older versions of containerd.

go mod does not allow using the main module as a local "replace" rule using
a path; see golang/go#45492 and golang/go#34417, so instead, an empty module
is used.

One change observed is that older versions containerd depended on an older
version of imgcrypt that had an "indirect" dependency on more current versions
of gopkg.in/yaml.v2 and prometheus/procfs.

For those, a temporary "indirect" dependency was added, until prometheus/client_golang
and kubernetes are updated.

from go mod graph (before):

    github.com/containerd/imgcrypt@v1.0.4-0.20210301171431-0ae5c75f59ba gopkg.in/yaml.v2@v2.4.0
    github.com/containerd/imgcrypt@v1.0.4-0.20210301171431-0ae5c75f59ba github.com/prometheus/procfs@v0.6.0

For some reason, some older versions of containerd are still taken into account,
causing satori/go.uuid to be added as "indirect" dependency, likely because some
modules have this dependency in their go.sum. This should likely disappear once
those plugins are updated to contain a current version of containerd.

    git grep 'github.com/satori/go.uuid'
    vendor/github.com/Microsoft/hcsshim/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
    vendor/github.com/containerd/aufs/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
    vendor/github.com/containerd/imgcrypt/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
    vendor/github.com/containerd/nri/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
    vendor/github.com/containerd/zfs/go.sum:github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-05-01 13:49:23 +02:00
Derek McGowan
0f332dadd1 Update cgroups for regenerated protos
The proto version was updated with cgroup in v1.0.0 but
the protos were not regenerated. The v1.0.1 tag fixes this.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-04-20 15:46:27 -07:00
Phil Estes
c4d30c173f Merge pull request #5379 from ktock/fix-push-race
Fix PushHandler cannot push image that contains duplicated blobs
2021-04-20 08:56:07 -04:00
ktock
ab1654d0e2 Fix PushHandler cannot push image that contains duplicated blobs
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2021-04-20 14:00:53 +09:00
Derek McGowan
3ef337ae3a Update containerd vendors to tags
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-04-19 10:59:29 -07:00
Akihiro Suda
d2d0afac05 Merge pull request #5385 from thaJeztah/bump_kubernetes_1.20.6 2021-04-19 23:42:33 +09:00
Sebastiaan van Stijn
5d79d3adbc go.mod: update kubernetes to v1.20.6
Includes updated protos with the gogo/protobuf fixes for CVE-2021-3121
(https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3121)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-19 09:43:25 +02:00
Sebastiaan van Stijn
1c03c377e5 go.mod: github.com/containerd/fifo v1.0.0
full diff: https://github.com/containerd/fifo/compare/115abcc95a1d...v1.0.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-19 09:27:45 +02:00
Sebastiaan van Stijn
12a2a21083 go.mod: github.com/google/uuid v1.2.0
full diff: https://github.com/google/uuid/compare/v1.1.2...v1.2.0

I did not switch to us the `uuid.NewString()` function; we are not currently using
`uuid.New()`, probably because it can `panic` in case an invalid UUID is produced;
in stead we are using `uuid.NewRandom()`, which is equivalent, but returns an
error instead.

Changes:

- v1.2.0: Add NewString()
  This release introduces the NewString() function which is the equivalent of
  uuid.New().String().
- v1.1.5: Syntactic cleanup
  There are no code changes. A missing period was add to a godoc comment and the
  linter was told to not complain that the results of hash.Write() are ignored
  (the function cannot fail)
- v1.1.4: Further error optimizations
  Do not allocate memory for errors (it is only one word)
- v1.1.3: Optimize error reporting
  Optimize length of time it takes to discover an input is bad by no longer using
  fmt.Errorf, which is quite slow. It now uses a custom error type that formats
  the string when the Error method is called rather than when generating the error.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-17 12:06:51 +02:00
Samuel Karp
6dd29c25f4 go.mod: github.com/containerd/aufs
Signed-off-by: Samuel Karp <me@samuelkarp.com>
2021-04-16 15:09:31 -07:00
Samuel Karp
330a2a8092 go.mod: github.com/containerd/zfs
Signed-off-by: Samuel Karp <me@samuelkarp.com>
2021-04-16 15:08:25 -07:00
Sebastiaan van Stijn
864a3322b3 go.mod: github.com/containerd/go-cni v1.0.2
full diff: https://github.com/containerd/go-cni/compare/v1.0.1...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-14 09:09:18 +02:00
Derek McGowan
c381ea27bd Merge pull request #5213 from thaJeztah/bump_typeurl
go.mod: github.com/containerd/typeurl v1.0.2
2021-04-13 20:31:25 -07:00
Derek McGowan
824b61075f Merge pull request #5350 from thaJeztah/tagged_go_winio
go.mod: github.com/Microsoft/go-winio v0.4.17
2021-04-13 20:29:44 -07:00
Sebastiaan van Stijn
ee34caccb3 go.mod: github.com/Microsoft/go-winio v0.4.17
no code changes as this is the same commit, but now tagged:

https://github.com/Microsoft/go-winio/compare/5516f17a5958...v0.4.17

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-13 23:56:53 +02:00
Sebastiaan van Stijn
d478676d35 go.mod: github.com/containerd/imgcrypt v1.1.1
No code changes other than an updated changelog, and updating to
the tagged v1.1.1:

diff: https://github.com/containerd/imgcrypt/compare/0bed51b9522c...v1.1.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-13 23:41:44 +02:00
Sebastiaan van Stijn
1dd45d51c7 go.mod: github.com/containerd/typeurl v1.0.2
full diff: https://github.com/containerd/typeurl/compare/v1.0.1...v1.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-13 23:21:21 +02:00
Sebastiaan van Stijn
ce116d4c59 go.mod: github.com/containerd/imgcrypt v1.1.1-0.20210412181126-0bed51b9522c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-13 01:06:38 +02:00
Sebastiaan van Stijn
c4778fe1b1 go.mod: github.com/containernetworking/plugins v0.9.1
full diff: https://github.com/containernetworking/plugins/compare/v0.8.6...v0.9.1

changes in vendored code:

- (in containernetworking/plugins): Fix race condition in GetCurrentNS
- (in containernetworking/cni): tighten up plugin-finding logic

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-12 22:10:06 +02:00
Akihiro Suda
2943310602 go.mod: github.com/containerd/console v1.0.2
Contains fix for s390x and support for FreeBSD

https://github.com/containerd/console/compare/v1.0.1...v1.0.2

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-04-12 15:58:08 +09:00
Sebastiaan van Stijn
36bf3f0e8a go.mod: github.com/Microsoft/hcsshim v0.8.16
full diff: https://github.com/microsoft/hcsshim/compare/v0.8.15...v0.8.16

also updating github.com/Microsoft/hcsshim/test to current master

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-09 09:12:12 +02:00
Sebastiaan van Stijn
21a175860d go.mod github.com/klauspost/compress v1.11.13
full diff: https://github.com/klauspost/compress/compare/v1.11.3...v1.11.13

adds arm64 decompression support, various performance improvements

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-04-07 19:15:59 +02:00
Fu, Wei
ff05d499e2 Merge pull request #5272 from thaJeztah/sync_test_replaces
synchronize replace rules in integration/client go.mod with main go.mod
2021-04-06 10:33:35 +08:00
Sebastiaan van Stijn
6fc9e45000 synchronize replace rules in integration/client go.mod with main go.mod
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

asdlkjasdlkj

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-30 16:21:28 +02:00
Maksym Pavlenko
3f406d4af6 Cleanup vendor
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-03-27 15:53:20 -07:00
Maksym Pavlenko
499c2f7d4a Vendor github.com/pelletier/go-toml
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-03-25 13:10:52 -07:00
Brian Goff
10a498c7c8 Update go-winio to fix compile error on armv7
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-03-24 22:56:24 +00:00
Brian Goff
1a9c6f557b Revendor zfs to to fix integer overflow
This currently breaks armhf builds.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-03-24 21:37:17 +00:00
Akihiro Suda
8cdc1f13b6 go.mod: github.com/containerd/zfs v0.0.0-20210322090317-0e92c2247fb7
Contains "Implements zfs usage by returning the USED field from the zfs snapshot"
(https://github.com/containerd/zfs/pull/38)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2021-03-22 16:58:00 +09:00
Michael Crosby
63b605d8fd Merge pull request #5210 from thaJeztah/bump_k8s
go.mod: kubernetes v1.20.4
2021-03-18 11:44:55 -04:00
Sebastiaan van Stijn
569023fd51 go.mod: github.com/containerd/nri v0.0.0-20210316161719-dbaa18c31c14
full diff: eb1350a751...dbaa18c31c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-16 17:56:01 +01:00
Sebastiaan van Stijn
0e1f59e896 go.mod: github.com/containerd/zfs v0.0.0-20210315114300-dde8f0fda960
no significant changes; removes the vendor directory in the repo

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-16 16:49:06 +01:00
Sebastiaan van Stijn
88d3881e1d go.mod: github.com/containerd/fifo v0.0.0-20210316144830-115abcc95a1d
full diff: 0724c46b32...115abcc95a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-16 16:01:16 +01:00
Sebastiaan van Stijn
a22c43fa44 go.mod: github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97
full diff: ffdde14902...20793ff83c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-16 15:36:29 +01:00
Sebastiaan van Stijn
f6f8617367 go.mod: github.com/containerd/btrfs v0.0.0-20210316141732-918d888fb676
full diff: 404b914980...918d888fb6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-16 15:33:23 +01:00
Sebastiaan van Stijn
460b35236e go.mod: kubernetes v1.20.4
no changes in vendored code, but syncing with the latest v1.20.x
patch release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-16 10:53:16 +01:00
Sebastiaan van Stijn
bd2c0898aa go.mod: github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0
full diff: 7016d3ce23...16b287bc67

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-13 20:12:12 +01:00
Sebastiaan van Stijn
24a8b460e7 go.mod: github.com/containerd/zfs v0.0.0-20210313052028-2233970b74b1
full diff: 11e8f1707f...2233970b74

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-03-13 10:45:23 +01:00