github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
5,732 Commits 3 Branches 2 Tags 112 MiB
0dc7c85956
Commit Graph

5732 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
c6851ace61
Merge pull request #4098 from thaJeztah/update_golangci_lint 
Update Golangci-lint v1.23.8
 2020-03-10 12:38:44 -04:00
Phil Estes
dc085abda5
Merge pull request #4097 from tklauser/fix-duplicate-imports 
Avoid duplicate imports of github.com/gogo/protobuf/types
 2020-03-10 08:46:49 -04:00
Sebastiaan van Stijn
4326fc624a
Update Golangci-lint v1.23.8 
full diff: https://github.com/golangci/golangci-lint/compare/v1.18.0...v1.23.8

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-10 12:46:31 +01:00
Sebastiaan van Stijn
4756258faf
service_windows.go: remove unused "service" variable 
This was added in 40d898a820, but
doesn't appear to be used.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-10 12:36:23 +01:00
Tobias Klauser
a9bd451ab4 Avoid duplicate imports of github.com/gogo/protobuf/types 
Re-use the import aliased as `ptypes`.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
 2020-03-10 09:41:03 +01:00
Michael Crosby
4eb9d15dc6
Merge pull request #4095 from thaJeztah/partial_revert 
Partial revert of sys: windows: use golang.org/x/sys/windows
 2020-03-09 14:43:33 -04:00
Phil Estes
3a0a52ab95
Merge pull request #4091 from SaiHarshaK/update-install-steps 
Update btrfs dependencies in docs
 2020-03-09 12:42:23 -04:00
SaiHarshaK
cad67b73f2
Update btrfs dependencies in docs for debian buster and ubuntu 19.10 
* Fixes: #4090

Signed-off-by: Sai Harsha Kottapalli  <k.saiharsha7@gmail.com>
 2020-03-09 20:57:15 +05:30
Sebastiaan van Stijn
6320236985
Partial revert of sys: windows: use golang.org/x/sys/windows 
- preserve `syscall.ENOTDIR` to match os.MkDirAll
- change back parameter name to `adminAndLocalSystem`
- revert accidental change of permissions of parent-dir

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-09 16:01:09 +01:00
Michael Crosby
9ec579bf8a
Merge pull request #4093 from thaJeztah/replace_more_syscall 
sys: windows: use golang.org/x/sys/windows
 2020-03-09 10:47:23 -04:00
Phil Estes
a30225b220
Merge pull request #4094 from thaJeztah/deprecate_sys_epoll 
sys: deprecate EpollCreate1, EpollCtl, EpollWait
 2020-03-09 10:43:27 -04:00
Phil Estes
b4f1986bf5
Merge pull request #4092 from thaJeztah/bump_x_sys 
vendor: golang.org/x/sys 5c8b2ff67527cb88b770f693cebf3799036d8bc0
 2020-03-09 08:44:26 -04:00
Sebastiaan van Stijn
0a7fd55f32
sys: deprecate EpollCreate1, EpollCtl, EpollWait 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-09 13:15:07 +01:00
Sebastiaan van Stijn
7b06192f61
sys: windows: use golang.org/x/sys/windows 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-09 13:05:53 +01:00
Sebastiaan van Stijn
1b7d1e81be
vendor: golang.org/x/sys 5c8b2ff67527cb88b770f693cebf3799036d8bc0 
full diff: 52ab431487...5c8b2ff675

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-09 10:07:33 +01:00
Akihiro Suda
92cfc5b1fb
Merge pull request #4088 from mxpv/sd 
Support NOTIFY_SOCKET
 2020-03-08 15:49:26 +09:00
Maksym Pavlenko
7a5fcf617e
Merge pull request #4089 from thaJeztah/update_cri 
Update containerd/cri 1a00c06886, kubernetes v1.8.0-beta.1
 2020-03-07 10:31:46 -08:00
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
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
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
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
Maksym Pavlenko
233d61f51c
Merge pull request #4083 from crosbymichael/resource-opts 
Add linux resource oci.SpecOpts
 2020-03-05 12:20:22 -08: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
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
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
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
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
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
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
Maksym Pavlenko
4d242818bf
Merge pull request #4053 from AkihiroSuda/vendor-grpc-20200225 
vendor protobuf & grpc (GoGoProtoPackageIsVersion3)
 2020-02-27 11:59:59 -08:00