Commit Graph

8778 Commits

Author SHA1 Message Date
Brian Pursley
aa04fc9d53 Change "failed to stop sandbox" error message to use state name instead of numeric value
Signed-off-by: Brian Pursley <bpursley@cinlogic.com>
2020-06-27 16:45:08 -04:00
Phil Estes
01a53c24b3
Merge pull request #4347 from Flowdalic/allow-rseq-seccomp
seccomp: allow 'rseq' syscall in default seccomp profile
2020-06-26 13:42:48 -04:00
Phil Estes
c76bf55047
Make unique snapshotter opt for label-assisted remapping
Provide a snapshotter opt to add labels used by any supporting
snapshotter to handle user namespace filesystem remapping. Currently
supported by the fuse-overlayfs snapshotter, and others can use this
information as well.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-06-26 13:14:28 -04:00
Jie Hao Liao
331793118f
allow user namespace remapping using snapshotters
Signed-off-by: Jie Hao Liao <liaojh1998@gmail.com>
2020-06-26 12:44:43 -04:00
Florian Schmaus
e977564a8b seccomp: allow 'rseq' syscall in default seccomp profile
Restartable Sequences (rseq) are a kernel-based mechanism for fast
update operations on per-core data in user-space. Some libraries, like
the newest version of Google's TCMalloc, depend on it [1].

This also makes dockers default seccomp profile on par with systemd's,
which enabled 'rseq' in early 2019 [2].

1: https://google.github.io/tcmalloc/design.html
2: systemd/systemd@6fee3be

Signed-off-by: Florian Schmaus <flo@geekplace.eu>
2020-06-26 17:10:05 +02:00
Mike Brown
09d6426f33
Merge pull request #1511 from kevpar/named-pipe-mounts
Support named pipe mounts for Windows containers
2020-06-25 15:31:38 -05:00
Kevin Parsons
210561a8e3 Support named pipe mounts for Windows containers
Adds support to mount named pipes into Windows containers. This support
already exists in hcsshim, so this change just passes them through
correctly in cri. Named pipe mounts must start with "\\.\pipe\".

Signed-off-by: Kevin Parsons <kevpar@microsoft.com>
2020-06-25 12:01:08 -07:00
Mike Brown
682d158399
Merge pull request #1517 from mikebrow/fix-e2e-bucket
hard set kubernetes version not in vendor.conf anymore
2020-06-24 19:54:54 -05:00
Mike Brown
f5c7ac9272 fix for image pull linter change
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-06-24 18:10:31 -05:00
Mike Brown
05cd942875 hard set kubernetes version not in vendor.conf anymore
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-06-24 18:02:30 -05:00
Michael Crosby
c751807409
Merge pull request #4325 from c445/mountinfo-linux-double-quotes
Cope with double quotes in Linux Mountinfo
2020-06-24 15:47:39 -04:00
Michael Crosby
492c014136
Merge pull request #4340 from AkihiroSuda/fix-4312
decrease log level of cgroup2 ToggleController error when running in UserNS
2020-06-24 15:45:37 -04:00
Derek McGowan
1127ffc740
Merge pull request #4207 from deitch/doc-content
describe content flow and dependencies
2020-06-24 11:46:20 -07:00
Avi Deitcher
e7f069e2c3 describe content flow and dependencies
Signed-off-by: Avi Deitcher <avi@deitcher.net>
2020-06-24 21:20:42 +03:00
Phil Estes
f85375bbbd
Merge pull request #4341 from thaJeztah/fix_cri_warnings
Fix deprecation warnings in CRI tests due to missing unix:// scheme
2020-06-24 10:31:40 -04:00
Sebastiaan van Stijn
b96f5f4b52
Fix deprecation warnings in CRI tests due to missing unix:// scheme
[BeforeEach] [k8s.io] Security Context
      /home/runner/work/containerd/containerd/src/github.com/kubernetes-sigs/cri-tools/pkg/framework/framework.go:50
    W0624 12:26:28.532644   30569 util_unix.go:103] Using "/var/run/containerd/containerd.sock" as endpoint is deprecated, please consider using full url format "unix:///var/run/containerd/containerd.sock".
    W0624 12:26:28.532700   30569 util_unix.go:103] Using "/var/run/containerd/containerd.sock" as endpoint is deprecated, please consider using full url format "unix:///var/run/containerd/containerd.sock".

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-06-24 14:55:13 +02:00
Akihiro Suda
fd99b6566b
decrease log level of cgroup2 ToggleController error when running in UserNS
Fix #4312

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-06-24 18:15:16 +09:00
Michael Crosby
c2f8011ff8
Merge pull request #4334 from AkihiroSuda/bbolt-1.3.5
vendor: update bbolt to v1.3.5
2020-06-23 13:23:43 -04:00
Derek McGowan
98aadbbe56
Merge pull request #1463 from dims/remove-dependencies-on-k8s.io/kubernetes
Remove dependencies on k8s.io/kubernetes
2020-06-23 10:21:13 -07:00
Wei Fu
e89500bcb0
Merge pull request #4333 from AkihiroSuda/golang-1.13.12
Bump Golang 1.13.12
2020-06-23 08:54:05 +08:00
Davanum Srinivas
3ee62de2bf
remove unused method
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-06-22 15:03:47 -04:00
Davanum Srinivas
cbb7c28f19
Add copyright headers
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-06-22 14:49:13 -04:00
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