github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,706 Commits 3 Branches 2 Tags 112 MiB
6be7c9f4e2
Commit Graph

8706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Pavlenko
bd22653003 Add devmapper configuration examples 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-03-17 18:16:58 -07:00
Kir Kolyshkin
5ef66e48f2 ParseSignal: drop add'l check for numeric signals 
The kernel will return an error anyway.

Drop the test case as well.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2020-03-17 14:17:03 -07:00
Derek McGowan
672eb827cb
Merge pull request #4113 from crosbymichael/shim-version 
add -v to shim binaries
 2020-03-17 12:42:26 -07:00
Michael Crosby
649f2aac66 add -v to shim binaries 
Request came from a slack message that shims do not output their versions making
it hard for users and operators to know what version of a shim they have on the
system.  This adds a `-v` flag to the shims so that users can see if a shim is
in sync with containerd or what versions of shims that they are running.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2020-03-17 13:23:06 -04:00
Akihiro Suda
5ebd0e5d0f
Merge pull request #4114 from estesp/more-golangci-time 
Increase golangci-lint timeout
 2020-03-18 00:59:56 +09:00
Phil Estes
4ff9d69966
Increase golangci-lint timeout 
AppVeyor is running over the current 2m timeout regularly these days
during PR CI runs.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-03-17 11:07:23 -04:00
Mike Brown
5fb103d8e6
Merge pull request #1382 from georgegoh/master 
Add correct paths for cri's systemd config files in CentOS.
 2020-03-16 12:11:03 -05:00
George Goh
c44ad801f9 Fixed merge conflicts. 2020-03-16 20:56:08 +08:00
Maksym Pavlenko
2532bdf43f
Merge pull request #4100 from lifubang/publisher 
fix dial error when clean up a dead shim
 2020-03-14 15:19:48 -07:00
Maksym Pavlenko
14fbcd886f
Merge pull request #4106 from thaJeztah/bump_cri 
vendor: containerd/cri 92cb4ed978
 2020-03-13 17:01:32 -07:00
Wei Fu
4d4c35b3a8
Merge pull request #1417 from mikebrow/add-golang-1.14-for-travis-tests 
add golang 1.14 to prepare for move
 2020-03-13 17:54:39 +08:00
Maksym Pavlenko
e2e40e19d7
Merge pull request #3924 from renzhengeek/renzhen/snapshot-gc 
snapshots/devmapper: do not stop snapshot GC when one snapshot removing fails
 2020-03-12 19:28:55 -07:00
Mike Brown
7cd773bd3b add golang 1.14 to prepare for move 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-03-12 19:30:19 -05:00
Sebastiaan van Stijn
c00cf9a670
vendor: containerd/cri 92cb4ed978 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-12 23:15:45 +01:00
Derek McGowan
92cb4ed978
Merge pull request #1416 from thaJeztah/ensure_remove_all 
Use local "ensureRemoveAll" instead of docker/pkg/system
 2020-03-12 14:53:57 -07:00
Sebastiaan van Stijn
e093a0ee08
Use local "ensureRemoveAll" instead of docker/pkg/system 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-12 20:21:14 +01:00
Phil Estes
62083eeed2
Merge pull request #4102 from kolyshkin/scan 
Nit: fix use of bufio.Scanner.Err
 2020-03-12 12:51:31 -04:00
lifubang
488d6194f2 fix dial error when clean up a dead shim 
Signed-off-by: lifubang <lifubang@acmcoder.com>
 2020-03-12 10:57:55 +08:00
Kir Kolyshkin
6e638ad27a Nit: fix use of bufio.Scanner.Err 
The Err() method should be called after the Scan() loop, not inside it.

Found by: git grep -A3 -F '.Scan()'

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
 2020-03-11 19:36:21 -07:00
Sebastiaan van Stijn
46fcfe5219
vendor: docker/docker 4634ce647cf2ce2c6031129ccd109e557244986f 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-03-10 18:06:27 +01:00
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
Mike Brown
687469d3ce
Merge pull request #1415 from AkihiroSuda/cgroup2-privileged-no-unshare-cgroupns 
cgroup2: do not unshare cgroup namespace for privileged
 2020-03-09 12:45:50 -05: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
fa72e2f693 cgroup2: do not unshare cgroup namespace for privileged 
Conforms to the latest KEP:
0e409b4749/keps/sig-node/20191118-cgroups-v2.md (cgroup-namespace)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-03-09 01:49:04 +09: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