github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
8,356 Commits 3 Branches 4 Tags
c876b15b5414a9eb004df163e1645d67b6e7681d
Commit Graph

8356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Davanum Srinivas
0d18d1ee38 Drop k8s.io/kubernetes 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-22 14:48:25 -04:00
Davanum Srinivas
6007c354a6 Copy kubernetes/pkg/kubelet/util 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-22 14:48:25 -04:00
Davanum Srinivas
e2072b71cc Copy kubernetes/pkg/util/bandwidth 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-22 14:48:25 -04:00
Davanum Srinivas
bb828a9f84 Make copy of pkg/kubelet/cri/remote 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-22 14:00:08 -04:00
Akihiro Suda
20b0e5b9d0 Merge pull request #4336 from dims/explicitly-fail-apparmor-when-not-running-on-linux 
Explicitly fail apparmor when not running on linux
 2020-06-23 02:59:00 +09:00
Davanum Srinivas
2909022a6e Make local copy of kubelet/cri/streaming 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-22 13:54:34 -04:00
Mike Brown
b8f7b9f692 Merge pull request #1515 from AkihiroSuda/golang-1.13.12 
Bump Golang 1.13.12
 2020-06-22 12:53:08 -05:00
Davanum Srinivas
2b0a994ccc explicitly fail apparmor when !linux 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-22 12:54:09 -04:00
Mike Brown
22b55461b3 Merge pull request #1514 from dims/update-kubernetes-to-1.19.0-beta.2 
Update kubernetes to 1.19.0 beta.2
 2020-06-22 10:58:47 -05:00
Davanum Srinivas
c4205721ee Update vendor/ directory 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-22 08:45:11 -04:00
Davanum Srinivas
41f184f15b Update vendor.conf to kubernetes 1.19.0-beta.2 
update streaming import path
switch remote package path

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2020-06-22 08:44:49 -04:00
Akihiro Suda
548d987fc2 Bump Golang 1.13.12 
Changes: https://github.com/golang/go/milestone/148?closed=1

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-06-22 17:00:00 +09:00
Akihiro Suda
bebfbab031 vendor: update bbolt to v1.3.5 
We had once updated bbolt from v1.3.3 to v1.3.4 in #4134,
but reverted to v1.3.3 in #4156 due to "fatal error: sweep increased
allocation count" (etcd-io/bbolt#214).

The issue was fixed in bbolt v1.3.5 (etcd-io/bbolt#220).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-06-22 16:54:15 +09:00
Akihiro Suda
1a83f9a638 Bump Golang 1.13.12 
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-06-22 16:49:31 +09:00
ktock
03ab1b2cac Add config for allowing GC to clean unpacked layers up 
This commit adds a flag through Pull API for allowing GC to clean layer contents
up after unpacking these contents completed.

This patch takes an approach to directly delete GC labels pointing to layers
from the manifest blob. This will result in other snapshotters cannot reuse
these contents on the next pull. But this patch mainly focuses on CRI use-cases
where single snapshotter is usually used throughout the node lifecycle so this
shouldn't be a matter.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-06-21 11:16:53 +09:00
Johannes Frey
ee734e867a Add test case with backticks 
Signed-off-by: Johannes Frey <me@johannes-frey.de>
 2020-06-18 08:37:31 +02:00
Akihiro Suda
bf672cccee Merge pull request #4328 from thaJeztah/bump_x_text 
vendor: golang.org/x/text v0.3.3 (CVE-2020-14040)
 2020-06-18 00:14:24 +09:00
Phil Estes
fb80a49ec1 Merge pull request #4327 from AkihiroSuda/fix-4326 
shim v2 runc: propagate options.Root to Cleanup
 2020-06-17 09:23:53 -04:00
Sebastiaan van Stijn
ea06877696 vendor: golang.org/x/text v0.3.3 
full diff: 19e51611da...v0.3.3

includes a fix for [CVE-2020-14040][1]

[1]: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2020-14040

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-06-17 13:15:11 +02:00
Akihiro Suda
f1a469a035 shim v2 runc: propagate options.Root to Cleanup 
Previously shim v2 (`io.containerd.runc.{v1,v2}`) always used `/run/containerd/runc` as the runc root.

Fix #4326

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-06-17 19:06:36 +09:00
Phil Estes
49b0743c1c Merge pull request #4324 from AkihiroSuda/fix-get-runtimeversion 
integration: assume TEST_RUNTIME to be io.containerd.runc.v2 by default
 2020-06-16 08:44:22 -04:00
Johannes Frey
8897e15203 Add more test cases with single quotes 
Signed-off-by: Johannes Frey <me@johannes-frey.de>
 2020-06-16 13:06:54 +02:00
Johannes Frey
cb91b1724d Add testcase containing mountpoint with escaped backslash 
Signed-off-by: Johannes Frey <me@johannes-frey.de>
 2020-06-16 13:06:54 +02:00
Johannes Frey
87f9fdb065 Cope with double quotes in Linux Mountinfo 
Signed-off-by: Johannes Frey <me@johannes-frey.de>
 2020-06-16 13:06:36 +02:00
Akihiro Suda
4c49ff88c5 integration: assume TEST_RUNTIME to be io.containerd.runc.v2 by default 
containerd 1.4 uses io.containerd.runc.v2 as the default runtime for
both CRI and non-CRI. The test is updated to assume v2 shim by default.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
 2020-06-16 14:41:25 +09:00
Phil Estes
705b8527d4 Merge pull request #4323 from crosbymichael/cri-bump1.4x 
Bump CRI for 1.4x release
 2020-06-15 16:28:35 -04:00
Michael Crosby
785f4c5cd9 Bump CRI for 1.4x release 
includes selinux bump.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-06-15 16:07:00 -04:00
Mike Brown
4f8a580795 Merge pull request #1510 from crosbymichael/selinux-bump 
bump selinux dep
 2020-06-15 14:50:23 -05:00
Michael Crosby
ae2f3fdfd1 Merge pull request #4315 from fuweid/fix-4294 
restart plugin: support binary log uri
 2020-06-15 15:24:41 -04:00
Michael Crosby
713205b369 bump selinux dep 
Includes fixes for the category range and mount labeling.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-06-15 15:15:35 -04:00
Michael Crosby
6164822714 Merge pull request #1508 from janosi/sctp-hostport 
Remove the protocol filter from the HostPort management
 2020-06-15 14:48:37 -04:00
Mike Brown
b661ad711e Merge pull request #1504 from lorenz/ignore-image-defined-volumes 
Add option for ignoring volumes defined in images
 2020-06-14 11:52:48 -05:00
Mike Brown
26dc5b9772 Merge pull request #1505 from dcantah/windows-cred-spec 
Add GMSA credential spec passing
 2020-06-14 11:52:33 -05:00
Laszlo Janosi
479dfbac45 Remove the protocol filter from the portMappings constructor. 
Reason: originally it was introduced to prevent the loading of the SCTP kernel module on the nodes. But iptables chain creation alone does not load the kernel module. The module would be loaded if an SCTP socket was created, but neither cri nor the portmap CNI plugin starts managing SCTP sockets if hostPort / portmappings are defined.
Signed-off-by: Laszlo Janosi <laszlo.janosi@ibm.com>
 2020-06-14 15:48:00 +00:00
Michael Crosby
185ea541d2 Merge pull request #4317 from KentaTada/modify-pdeathsignal-type 
Change the type of PdeathSignal
 2020-06-12 11:34:17 -04:00
Kenta Tada
730b7a932e Change the type of PdeathSignal 
Use x/sys as same as runtime/v1/linux/runtime.go

Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
 2020-06-11 11:35:51 +09:00
Daniel Canter
9620b2e1da Add GMSA Credential Spec passing 
Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2020-06-10 11:15:07 -07:00
Wei Fu
ae8200bf93 Merge pull request #1499 from webwurst/patch-1 
Fix typo
 2020-06-10 13:46:29 +08:00
Mike Brown
3290b86a8c Merge pull request #1506 from cpuguy83/registry_headers 
Add config for registry http headers
 2020-06-09 18:43:11 -05:00
Lorenz Brun
5a1d49b063 Add option for ignoring volumes defined in images 
Signed-off-by: Lorenz Brun <lorenz@brun.one>
 2020-06-09 21:02:47 +02:00
Wei Fu
d656fa38ca restart plugin: support binary log uri 
Introduce LogURIGenerator helper function in cio package. It is used in
the restart options, like WithBinaryLogURI and WithFileLogURI.

And restart.LogPathLabel might be used in production and work well. In
order to reduce breaking change, the LogPathLabel is still recognized if
new LogURILabel is not set. In next release 1.5, the LogPathLabel will
be removed.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-06-10 00:09:24 +08:00
Brian Goff
c694c63176 Add config for registry http headers 
This adds a configuration knob for adding request headers to all
registry requests. It is not namespaced to a registry.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-06-08 18:56:15 -07:00
Wei Fu
834665d9db Merge pull request #4311 from rudyfly/upsteam_overlay_indexoff 
overlay: use index=off to fix EBUSY on mount
 2020-06-09 08:25:06 +08:00
Michael Crosby
7868e8d6aa Merge pull request #4309 from gaurav1086/waitForPid_fix_goroutine_leak 
waitForPid: fix goroutine leak
 2020-06-08 16:34:53 -04:00
Michael Crosby
7fdcd07feb Merge pull request #4310 from gaurav1086/process_io_fix_goroutine_leak 
Process I/O: Fix goroutine leak
 2020-06-08 16:34:11 -04:00
Derek McGowan
4e6d38606c Merge pull request #4313 from crosbymichael/allow-list 
Update usage of whitelist in project
 2020-06-08 12:35:20 -07:00
Michael Crosby
0f831093ce Update usage of whitelist in project 
Signed-off-by: Michael Crosby <michael@thepasture.io>
 2020-06-08 12:49:22 -05:00
Rudy Zhang
d36810d66d overlay: use index=off to fix EBUSY on mount 
kernel version > 4.13rc1 support index=on feature, it will be failed
with EBUSY when trying to mount.

Related: https://github.com/moby/moby/pull/37993

Signed-off-by: Rudy Zhang <rudyflyzhang@gmail.com>
 2020-06-08 15:51:15 +08:00
Gaurav Singh
7213cd89d6 Process I/O: Fix goroutine leak 
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
 2020-06-07 17:38:36 -04:00
Gaurav Singh
ae08491bff waitForPid: fix goroutine leak 
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
 2020-06-07 17:33:10 -04:00