Commit Graph

9017 Commits

Author SHA1 Message Date
Maksym Pavlenko
ddae905b82 Support NOTIFY_SOCKET
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-03-07 10:24:51 -08:00
Sebastiaan van Stijn
b78dfbdfbe
vendor: golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf
full diff: c990c680b6...52ab431487

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:36 +01:00
Sebastiaan van Stijn
ba6796abde
vendor: update kubernetes v1.18.0-beta.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:32 +01:00
Sebastiaan van Stijn
f3d062423c
vendor: sigs.k8s.io/yaml v1.2.0
full diff: https://github.com/kubernetes-sigs/yaml/compare/v1.1.0...v1.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:29 +01:00
Sebastiaan van Stijn
04c805e636
vendor: github.com/google/gofuzz v1.1.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:23 +01:00
Sebastiaan van Stijn
12c7d69769
vendor: update containerd/cri 1a00c06886
full diff: c0294ebfe0...1a00c06886

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 14:35:14 +01:00
Sebastiaan van Stijn
5607b23b0f
vendor.conf: move some imports to match position with containerd/cri
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-07 13:18:47 +01:00
Maksym Pavlenko
3868dd7540
Merge pull request #4087 from crosbymichael/cgroups-exports
export cgroups collectors
2020-03-06 11:44:44 -08:00
Michael Crosby
97ca1be067
Merge pull request #4058 from tedyu/get-process
Avoid allocating slice for finding Process
2020-03-06 13:16:18 -05:00
zyu
e3ab8bda60 Avoid allocating slice for finding Process
Signed-off-by: zyu <yuzhihong@gmail.com>
2020-03-06 09:51:26 -08:00
Michael Crosby
1239f54035 export cgroups collectors
This makes it easier to extend the collectors to be used by external code and
task managers

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2020-03-06 12:51:22 -05:00
Mike Brown
1a00c06886
Merge pull request #1413 from thaJeztah/update_kubernetes
vendor: update kubernetes to v1.18.0-beta.1
2020-03-06 11:19:56 -06:00
Michael Crosby
aac6a51ee7
Merge pull request #4059 from fuweid/me-upstream-release-status
RELEASES.md: update release status
2020-03-06 11:45:57 -05:00
Michael Crosby
35a8de8996
Merge pull request #4080 from mxpv/opts
Pass snapshotter opts from client Pull
2020-03-06 10:26:28 -05:00
Sebastiaan van Stijn
a3e7f68fa5
vendor: update kubernetes v1.18.0-beta.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-06 16:18:37 +01:00
Sebastiaan van Stijn
4210588d3c
vendor: sigs.k8s.io/yaml v1.2.0
full diff: https://github.com/kubernetes-sigs/yaml/compare/v1.1.0...v1.2.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-06 16:18:35 +01:00
Sebastiaan van Stijn
ef54a7839a
vendor: bump golang.org/x/crypto bac4c82f6975 (CVE-2020-9283)
no local changes

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-06 16:18:33 +01:00
Sebastiaan van Stijn
b1417519e0
vendor: github.com/google/gofuzz v1.1.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-06 16:18:30 +01:00
Mike Brown
5f0cbd5ffe
Merge pull request #1414 from thaJeztah/update_containerd
vendor: update containerd 0131015594
2020-03-06 08:42:39 -06:00
Wei Fu
8c9e84174d RELEASES.md: update release status
1. Update release status
2. Add Extended state for release v1.2

Signed-off-by: Wei Fu <fuweid89@gmail.com>
2020-03-06 10:29:39 +08:00
Maksym Pavlenko
936b7b0043
Merge pull request #4085 from thaJeztah/update_crypto
vendor: bump golang.org/x/crypto bac4c82f6975
2020-03-05 16:36:11 -08:00
Sebastiaan van Stijn
24cbca5a78
vendor: update containerd 0131015594
full diff: e1221e69a8...0131015594

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-05 23:49:40 +01:00
Sebastiaan van Stijn
e0a8fe7cb6
vendor: bump golang.org/x/crypto bac4c82f6975
This version contains a fix for CVE-2020-9283, but the code-path
is not in use in this repository.

Updating the dependency in case people are concerned that we
use a version of the dependency that doesn't have the fix.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-05 22:14:32 +01:00
Phil Estes
0131015594
Merge pull request #4084 from crosbymichael/kill-all-check
[carry] Check error return from json.Unmarshal
2020-03-05 16:04:54 -05:00
Mike Brown
d68533d654
Merge pull request #1412 from mikebrow/update-golang-1.13.8
update to golang 1.13.8
2020-03-05 14:44:40 -06:00
Mike Brown
d5ff8b5781
Merge pull request #1411 from thaJeztah/reformat_vendor
Reformat vendor.conf: use columns, pin by git-sha, and sort alphabetically
2020-03-05 14:21:44 -06:00
Maksym Pavlenko
233d61f51c
Merge pull request #4083 from crosbymichael/resource-opts
Add linux resource oci.SpecOpts
2020-03-05 12:20:22 -08:00
Mike Brown
ad984ca844 update to golang 1.13.8
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-03-05 13:31:15 -06:00
Ted Yu
a687d3a36d Check error return from json.Unmarshal
Signed-off-by: Ted Yu <yuzhihong@gmail.com>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2020-03-05 13:38:08 -05:00
Sebastiaan van Stijn
3650918d9d
vendor.conf: reformat to use columns
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-05 19:32:07 +01:00
Sebastiaan van Stijn
1b74251d91
vendor.conf: sort imports alphabetically
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-05 19:28:26 +01:00
Michael Crosby
a3ca8a0dfc Add linux resource oci.SpecOpts
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2020-03-05 13:02:10 -05:00
Maksym Pavlenko
54fd2cba49
Merge pull request #4081 from crosbymichael/info-spec
Add ctr c info --spec flag to output spec
2020-03-05 09:54:41 -08:00
Michael Crosby
00e6be9f45 Add ctr c info --spec flag to output spec
This flag makes it easy to view only the OCI spec for the container.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2020-03-05 12:10:14 -05:00
Mike Brown
073e3c9bb4
Merge pull request #1403 from thaJeztah/align_selinux_to_tag
vendor: update golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf
2020-03-03 13:04:02 -06:00
Maksym Pavlenko
3be12fe1c0 Do not loose snapshotter options
Pass snapshotter options in recursive applyLayers calls.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-03-02 13:48:41 -08:00
Maksym Pavlenko
8cddb5f91d Pass snapshotter opts during Pull
For remote snapshotter cases it's quite often there is need to pass extra info
from client (for instance - registry URL to query remote layer from, credentials, etc).

This commit slightly extends WithPullSnapshotter to pass extra labels to a snapshotter.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2020-03-02 13:45:40 -08:00
Sebastiaan van Stijn
bb59a061ef
vendor: update golang.org/x/sys 52ab431487773bc9dd1b0766228b1cf3944126bf
full diff: c990c680b6...52ab431487

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-02 18:12:23 +01:00
Maksym Pavlenko
ca66f3dd5d
Merge pull request #4076 from kevpar/windows-cri-support
Enable CRI plugin for Windows builds as well
2020-02-29 21:55:11 -08:00
Eric Ren
a3685262fe snapshots/devmapper: do not stop snapshot GC when one snapshot removing fails
Snapshots GC takes use of pruneBranch() function to remove snapshots,
but GC will stop if snapshotter.Remove() returns error and the error
number is not ErrFailedPrecondition. This results in thousands of
dm snapshots not deleted if one snapshot is not deleted, due to
errors like "contains a filesystem in use".

So return ErrFailedPrecondition error number in Remove() function where
appropriate, and let GC process go on collecting other snapshots.

Fix: #3923
Signed-off-by: Eryu Guan <eguan@linux.alibaba.com>
Signed-off-by: Eric Ren <renzhen.rz@linux.alibaba.com>
2020-02-29 13:32:48 +08:00
Eric Ren
b6bf7b97c2 devmapper: async remove device using Cleanup
Fix: #3923
Signed-off-by: Eric Ren <renzhen@linux.alibaba.com>
2020-02-29 13:32:48 +08:00
Phil Estes
3a1c6a260a
Merge pull request #4073 from dims/update-opencontainers/selinux-to-1.3.3
Update to a released version of opencontainers/selinux (1.3.3)
2020-02-28 17:45:44 -05:00
Kevin Parsons
c7eec0c178 Fix file header in builtins_cri.go
Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2020-02-28 14:34:13 -08:00
Mike Brown
6565c640be
Merge pull request #1407 from dims/update-opencontainers/selinux-to-1.3.3
Update to a released version of opencontainers/selinux (1.3.3)
2020-02-28 14:56:49 -06:00
Phil Estes
269015e31c
Merge pull request #4072 from thaJeztah/update_gotest_tools_v3
vendor: update gotest.tools v3.0.2
2020-02-28 13:00:41 -05:00
Mike Brown
d4d6b3a0fc
Merge pull request #1340 from lumjjb/enc-node-model
Implement node key model for image encryption
2020-02-28 10:49:36 -06:00
Sebastiaan van Stijn
f2edc6f164
vendor: update gotest.tools v3.0.2
full diff: https://github.com/gotestyourself/gotest.tools/compare/v2.3.0...v3.0.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-28 17:47:20 +01:00
Davanum Srinivas
3d4c597bdc
Update to a released version of opencontainers/selinux (1.3.3)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-02-28 11:43:02 -05:00
Davanum Srinivas
026e43806a
Update to a released version of opencontainers/selinux (1.3.3)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-02-28 11:34:40 -05:00
Brandon Lum
8d5a8355d0 Updated docs and code for default nil behavior
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2020-02-27 23:42:03 +00:00