Commit Graph

279 Commits

Author SHA1 Message Date
Lantao Liu
a010715584
Add a separate CLI for cri-containerd ctrcri.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:06 -07:00
Lantao Liu
a843a30645
Use registry-1.docker.io as backup
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:06 -07:00
Lantao Liu
ec649079a9
Put version into metadata so that version won't be changed across
restart.

Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:06 -07:00
Lantao Liu
7cbc1c8dc3
Set registry mirror.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:06 -07:00
Lantao Liu
9f0816ac43
Configure container runtime cgroups for cgroup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:06 -07:00
Lantao Liu
be72f47ec9
Add runtime cgroup and fix a cli panic.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:05 -07:00
Lantao Liu
680e21c430
Update all glog flags to log-level.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:05 -07:00
Lantao Liu
d50b9dd64c
Update containerd to 6c7abf7c76c1973d4fb4b0bad51691de84869a51.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:05 -07:00
Lantao Liu
869ea6b0c8
Add document for kube-up.sh
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:05 -07:00
Lantao Liu
30cbfb62ec
Add OS and arch in release tarball.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:05 -07:00
Lantao Liu
0512d1e0b2
Add cluster directory and health-monitor.sh.
Signed-off-by: Lantao Liu <lantaol@google.com>
2020-08-11 09:15:05 -07:00
Sebastiaan van Stijn
55c9eade39
Bump Golang 1.13.15
full diff: https://github.com/golang/go/compare/go1.13.14...go1.13.15

go1.13.15 (released 2020/08/06) includes security fixes to the encoding/binary
package. See the Go 1.13.15 milestone on the issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.15+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-08 15:07:28 +02:00
Sebastiaan van Stijn
089672fff4
Bump Golang 1.13.14
full diff: https://github.com/golang/go/compare/go1.13.13...go1.13.14

go1.13.14 (released 2020/07/16) includes fixes to the compiler, vet, and the
database/sql, net/http, and reflect packages. See the Go 1.13.14 milestone on
the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.14+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-17 15:37:52 +02:00
Akihiro Suda
c520f819a2
Bump Go 1.13.13
Includes security fixes to the `crypto/x509` and `net/http` packages.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.13+label%3ACherryPickApproved

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-15 14:24:48 +09: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
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
2b0a994ccc
explicitly fail apparmor when !linux
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-06-22 12:54:09 -04: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
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
Kenta Tada
03755821d2 seccomp: remove the unused query_module(2)
query_module(2) is only in kernels before Linux 2.6.

Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
2020-05-19 10:36:55 +09:00
Phil Estes
d7c4bda3b1
Merge pull request #4264 from thaJeztah/seccomp_allow_clock_adjtime
seccomp: Whitelist `clock_adjtime`
2020-05-18 09:36:08 -04:00
Stanislav Levin
5765991f2c
seccomp: Whitelist clock_adjtime
This only allows making the syscall. CAP_SYS_TIME is still required
for time adjustment (enforced by the kernel):

```
kernel/time/posix-timers.c:

1112 SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
1113                 struct __kernel_timex __user *, utx)
...
1121         err = do_clock_adjtime(which_clock, &ktx);

1100 int do_clock_adjtime(const clockid_t which_clock, struct __kernel_timex * ktx)
1101 {
...
1109         return kc->clock_adj(which_clock, ktx);

1299 static const struct k_clock clock_realtime = {
...
1304         .clock_adj              = posix_clock_realtime_adj,

188 static int posix_clock_realtime_adj(const clockid_t which_clock,
189                                     struct __kernel_timex *t)
190 {
191         return do_adjtimex(t);

kernel/time/timekeeping.c:

2312 int do_adjtimex(struct __kernel_timex *txc)
2313 {
...
2321         /* Validate the data before disabling interrupts */
2322         ret = timekeeping_validate_timex(txc);

2246 static int timekeeping_validate_timex(const struct __kernel_timex *txc)
2247 {
2248         if (txc->modes & ADJ_ADJTIME) {
...
2252                 if (!(txc->modes & ADJ_OFFSET_READONLY) &&
2253                     !capable(CAP_SYS_TIME))
2254                         return -EPERM;
2255         } else {
2256                 /* In order to modify anything, you gotta be super-user! */
2257                 if (txc->modes && !capable(CAP_SYS_TIME))
2258                         return -EPERM;

```

Fixes: moby/moby 40919
Signed-off-by: Stanislav Levin <slev@altlinux.org>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-17 23:11:04 +02:00
Sebastiaan van Stijn
d07a71b97f
Bump Golang 1.13.11
full diff: https://github.com/golang/go/compare/go1.13.10...go1.13.11

go1.13.11 (released 2020/05/14) includes fixes to the compiler. See the Go 1.13.11
milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.11+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-05-16 14:57:04 +02:00
Antonio Ojea
11a78d9d0f
don't use socat for port forwarding
use goroutines to copy the data from the stream to the TCP
connection, and viceversa, removing the socat dependency.

Quoting Lantao Liu, the logic is as follow:

When one side (either pod side or user side) of portforward
is closed, we should stop port forwarding.

When one side is closed, the io.Copy use that side as source will close,
but the io.Copy use that side as dest won't.

Signed-off-by: Antonio Ojea <antonio.ojea.garcia@gmail.com>
2020-05-09 00:54:30 +02:00
Sebastiaan van Stijn
7da1e13b5d
Bump Golang 1.13.10
go1.13.10 (released 2020/04/08) includes fixes to the go command, the runtime,
os/exec, and time packages. See the Go 1.13.10 milestone on the issue tracker
for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.10+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.13.9...go1.13.10

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-09 22:03:48 +02:00
Sebastiaan van Stijn
aa76d95375
Bump Golang 1.13.9
go1.13.9 (released 2020/03/19) includes fixes to the go command, tools, the
runtime, the toolchain, and the crypto/cypher package. See the Go 1.13.9
milestone on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.9+label%3ACherryPickApproved

full diff: https://github.com/golang/go/compare/go1.13.8...go1.13.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-04-03 19:55:37 +02:00
Sebastiaan van Stijn
9529c69b8a
seccomp: add 64-bit time_t syscalls
Relates to https://patchwork.kernel.org/patch/10756415/

Added to whitelist:

- `clock_getres_time64` (equivalent of `clock_getres`, which was whitelisted)
- `clock_gettime64` (equivalent of `clock_gettime`, which was whitelisted)
- `clock_nanosleep_time64` (equivalent of `clock_nanosleep`, which was whitelisted)
- `futex_time64` (equivalent of `futex`, which was whitelisted)
- `io_pgetevents_time64` (equivalent of `io_pgetevents`, which was whitelisted)
- `mq_timedreceive_time64` (equivalent of `mq_timedreceive`, which was whitelisted)
- `mq_timedsend_time64 ` (equivalent of `mq_timedsend`, which was whitelisted)
- `ppoll_time64` (equivalent of `ppoll`, which was whitelisted)
- `pselect6_time64` (equivalent of `pselect6`, which was whitelisted)
- `recvmmsg_time64` (equivalent of `recvmmsg`, which was whitelisted)
- `rt_sigtimedwait_time64` (equivalent of `rt_sigtimedwait`, which was whitelisted)
- `sched_rr_get_interval_time64` (equivalent of `sched_rr_get_interval`, which was whitelisted)
- `semtimedop_time64` (equivalent of `semtimedop`, which was whitelisted)
- `timer_gettime64` (equivalent of `timer_gettime`, which was whitelisted)
- `timer_settime64` (equivalent of `timer_settime`, which was whitelisted)
- `timerfd_gettime64` (equivalent of `timerfd_gettime`, which was whitelisted)
- `timerfd_settime64` (equivalent of `timerfd_settime`, which was whitelisted)
- `utimensat_time64` (equivalent of `utimensat`, which was whitelisted)

Not added to whitelist:

- `clock_adjtime64` (equivalent of `clock_adjtime`, which was not whitelisted)
- `clock_settime64` (equivalent of `clock_settime`, which was not whitelisted)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-03-25 14:07:38 +01:00
George Goh
c44ad801f9 Fixed merge conflicts. 2020-03-16 20:56:08 +08:00
Sebastiaan van Stijn
499ab8a99a
Update Golang 1.13.8
full diff: https://github.com/golang/go/compare/go1.13.7...go1.13.8

go1.13.8 (released 2020/02/12) includes fixes to the runtime, the crypto/x509,
and net/http packages. See the Go 1.13.8 milestone on the issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.8+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-02-17 17:18:25 +01:00
Mike Brown
c9ed98462d move to v3.2 for the pause image
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-02-14 12:55:52 -06:00
Shengjing Zhu
348e683ceb Fix zsh autocomplete script
Fix completion when argument startswith `-`
Merged in upstream https://github.com/urfave/cli/pull/1062

Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2020-02-11 19:56:27 +08:00
Sebastiaan van Stijn
32ba75f0fb
Update Golang 1.13.7 (CVE-2020-0601, CVE-2020-7919)
full diff: https://github.com/golang/go/compare/go1.13.6...go1.13.7

go1.13.7 (released 2020/01/28) includes two security fixes. One mitigates
the CVE-2020-0601 certificate verification bypass on Windows. The other affects
only 32-bit architectures.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.7+label%3ACherryPickApproved

- X.509 certificate validation bypass on Windows 10
  A Windows vulnerability allows attackers to spoof valid certificate chains when
  the system root store is in use. These releases include a mitigation for Go
  applications, but it’s strongly recommended that affected users install the
  Windows security update to protect their system.
  This issue is CVE-2020-0601 and Go issue golang.org/issue/36834.
- Panic in crypto/x509 certificate parsing and golang.org/x/crypto/cryptobyte
  On 32-bit architectures, a malformed input to crypto/x509 or the ASN.1 parsing
  functions of golang.org/x/crypto/cryptobyte can lead to a panic.
  The malformed certificate can be delivered via a crypto/tls connection to a
  client, or to a server that accepts client certificates. net/http clients can
  be made to crash by an HTTPS server, while net/http servers that accept client
  certificates will recover the panic and are unaffected.
  Thanks to Project Wycheproof for providing the test cases that led to the
  discovery of this issue. The issue is CVE-2020-7919 and Go issue golang.org/issue/36837.
  This is also fixed in version v0.0.0-20200124225646-8b5121be2f68 of golang.org/x/crypto/cryptobyte.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-28 18:35:49 +01:00
George Goh
f50816381e Add correct paths for cri's systemd config files in CentOS.
Signed-off-by: George Goh <gohge@vmware.com>
2020-01-23 09:15:26 +08:00
Sebastiaan van Stijn
94964b36d0
Update Golang 1.13.6
full diff: https://github.com/golang/go/compare/go1.13.5...go1.13.6

go1.13.6 (released 2020/01/09) includes fixes to the runtime and the net/http
package. See the Go 1.13.6 milestone on the issue tracker for details.

https://github.com/golang/go/issues?q=milestone%3AGo1.13.6+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-01-17 15:54:16 +01:00
Derek McGowan
123af61c0b
Add Cleanup to snapshot API
Cleanup is an optional method a snapshotter may implement.
Cleanup can be used to cleanup resources after a snapshot
has been removed. This function allows a snapshotter to defer
longer resource cleanup until after snapshot removals are
completed. Adding this to the API allows proxy snapshotters
to leverage this enhancement.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2020-01-07 14:59:20 -08:00
Sebastiaan van Stijn
c07e356d29
Update Golang 1.13.5
go1.13.5 (released 2019/12/04) includes fixes to the go command, the runtime, the
linker, and the net/http package. See the Go 1.13.5 milestone on our issue tracker
for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.5+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-12-23 15:27:18 +01:00
Wei Fu
f684e5a775
Merge pull request #3815 from estesp/fix-Dockerfile
Update name for btrfs headers package
2019-11-11 14:12:27 +08:00
Phil Estes
fda652be5a
Update name for btrfs headers package
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-11-09 15:22:35 -05:00
Sebastiaan van Stijn
608791bfc3
Update to Golang 1.13.4
go1.13.4 (released 2019/10/31) includes fixes to the net/http and syscall
packages. It also fixes an issue on macOS 10.15 Catalina where the non-
notarized installer and binaries were being rejected by Gatekeeper.
See the Go 1.13.4 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.13.4

Update to Golang 1.13.3:

go1.13.3 (released 2019/10/17) includes fixes to the go command, the toolchain,
the runtime, syscall, net, net/http, and crypto/ecdsa packages. See the Go
1.13.3 milestone on the issue tracker for details:
https://github.com/golang/go/issues?q=milestone%3AGo1.13.3

Update to Golang 1.13.2:

go1.13.2 (released 2019/10/17) includes security fixes to the crypto/dsa
package and the compiler. See the Go 1.13.2 milestone on the issue tracker
for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.2

Update to Golang 1.13.1:

go1.13.1 (released 2019/09/25) includes security fixes to the
net/http and net/textproto packages. See the Go 1.13.1 milestone
on the issue tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.13.1

Update to Golang 1.13.0:

Full diff: https://github.com/golang/go/compare/go1.12.9...go1.13
Milestone: https://github.com/golang/go/milestone/83?closed=1

Today the Go team is very happy to announce the release of Go 1.13. You can get it
from the download page.

Some of the highlights include:

- The go command now downloads and authenticates modules using the Go module
  mirror and Go checksum database by default (https://golang.org/doc/go1.13#introduction)
- Improvements to number literals (https://golang.org/doc/go1.13#language)
- Error wrapping (https://golang.org/doc/go1.13#error_wrapping)
- TLS 1.3 on by default (https://golang.org/doc/go1.13#tls_1_3)
- Improved modules support (https://golang.org/doc/go1.13#modules)

For the complete list of changes and more information about the improvements above,
see the Go 1.13 release notes: https://golang.org/doc/go1.13

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-08 13:26:59 -08:00
Sebastiaan van Stijn
15669a1d34
Update to Golang 1.12.13
go1.12.13 (released 2019/10/31) fixes an issue on macOS 10.15 Catalina
where the non-notarized installer and binaries were being rejected by
Gatekeeper. Only macOS users who hit this issue need to update.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-11-08 10:28:40 -08:00
Derek McGowan
66aa1d3ef6
Add snapshot walk implementations
Temporarily remove zfs and aufs until interface update

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2019-10-24 11:11:22 -07:00
Phil Estes
3bf461ae8e
Move autocomplete files to contrib/
Since recent versions of `vndr` are going to remove the autocomplete
scripts from the urfave vendored content, we will just move them into
`contrib/` and reference them in the documentation from that location.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2019-10-21 13:57:56 -04:00
Sebastiaan van Stijn
6356e55be0
Update Golang 1.12.12 (CVE-2019-17596)
Golang 1.12.12
-------------------------------

go1.12.12 (released 2019/10/17) includes fixes to the go command, runtime,
syscall and net packages. See the Go 1.12.12 milestone on our issue tracker for
details.

https://github.com/golang/go/issues?q=milestone%3AGo1.12.12

Golang 1.12.11 (CVE-2019-17596)
-------------------------------

go1.12.11 (released 2019/10/17) includes security fixes to the crypto/dsa
package. See the Go 1.12.11 milestone on our issue tracker for details.
https://github.com/golang/go/issues?q=milestone%3AGo1.12.11

[security] Go 1.13.2 and Go 1.12.11 are released

Hi gophers,

We have just released Go 1.13.2 and Go 1.12.11 to address a recently reported
security issue. We recommend that all affected users update to one of these
releases (if you're not sure which, choose Go 1.13.2).

Invalid DSA public keys can cause a panic in dsa.Verify. In particular, using
crypto/x509.Verify on a crafted X.509 certificate chain can lead to a panic,
even if the certificates don't chain to a trusted root. The chain can be
delivered via a crypto/tls connection to a client, or to a server that accepts
and verifies client certificates. net/http clients can be made to crash by an
HTTPS server, while net/http servers that accept client certificates will
recover the panic and are unaffected.

Moreover, an application might crash invoking
crypto/x509.(*CertificateRequest).CheckSignature on an X.509 certificate
request, parsing a golang.org/x/crypto/openpgp Entity, or during a
golang.org/x/crypto/otr conversation. Finally, a golang.org/x/crypto/ssh client
can panic due to a malformed host key, while a server could panic if either
PublicKeyCallback accepts a malformed public key, or if IsUserAuthority accepts
a certificate with a malformed public key.

The issue is CVE-2019-17596 and Go issue golang.org/issue/34960.

Thanks to Daniel Mandragona for discovering and reporting this issue. We'd also
like to thank regilero for a previous disclosure of CVE-2019-16276.

The Go 1.13.2 release also includes a fix to the compiler that prevents improper
access to negative slice indexes in rare cases. Affected code, in which the
compiler can prove that the index is zero or negative, would have resulted in a
panic in Go 1.12, but could have led to arbitrary memory read and writes in Go
1.13 and Go 1.13.1. This is Go issue golang.org/issue/34802.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-10-18 13:52:34 +02:00
Philip Marin
3a8687f05c Containerd version updated for kubernetes ansible example.
Closes #1317

Old version of containerd causes kubectl exec error.

Signed-off-by: Philip Marin <phil@phil.land>
2019-10-14 20:34:51 +03:00
Lantao Liu
523f3440b0 Add TaskMax=infinity
Signed-off-by: Lantao Liu <lantaol@google.com>
2019-08-29 14:35:43 -07:00
Akihiro Suda
4a75a63f4a
Merge pull request #3600 from crosbymichael/sigprocmask
Add sigprocmask to default seccomp profile
2019-08-30 03:47:32 +09:00
Michael Crosby
779701b29c Add --seccomp flag to ctr
This enables testing of containers with the default seccomp profile

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-29 13:02:21 -04:00
Michael Crosby
86f8be86e1 Add sigprocmask to default profile
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2019-08-29 11:07:03 -04:00
AllenZMC
f4927a2985 fix mis-spelling in nvidia.go
Signed-off-by: 常仲民@daocloud <zhongming.chang@daocloud.io>
2019-08-29 23:03:09 +08:00
Kenta Tada
5b9a43d2e7 Fix seccomp contributed profile for clone syscall
All clone flags for namespace should be denied.
Also x/sys should be used instead of syscall.

Signed-off-by: Kenta Tada <Kenta.Tada@sony.com>
2019-06-03 14:23:34 +09:00
Sebastiaan van Stijn
2741dbe2c1
contrib: Dockerfile: bump go 1.12
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 12:59:20 +02:00
Sebastiaan van Stijn
a84f87d84f
contrib: Dockerfile: add a base stage
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 12:26:55 +02:00
Sebastiaan van Stijn
a07e12cded
contrib: Dockerfile: reformat, and use --no-install-recommends
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 12:24:41 +02:00
Sebastiaan van Stijn
ba9e1ea23c
contrib: Dockerfile: use build-arg for go-version
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-04-05 12:16:36 +02:00
Maksym Pavlenko
8784eb6308 Move snapshotters benchmark to a separate package
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-04-02 14:42:21 -07:00
Maksym Pavlenko
d9526f5c4f Move CloudFormation template to contrib
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
2019-04-01 13:34:48 -07:00
Sebastiaan van Stijn
8f8fd3c3a8
seccomp: whitelist statx syscall
This whitelists the statx syscall; libseccomp-2.3.3 or up
is needed for this, older seccomp versions will ignore this.

Equivalent of https://github.com/moby/moby/pull/36417

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2019-03-20 11:59:02 +01:00
Avi Kivity
4506eb45bf seccomp: whitelist io_pgetevents
io_pgetevents() is a new Linux system call, similar to the already-whitelisted
io_getevents(). It has no security implications. Whitelist it so applications can
use the new system call.

Fixes #3105.

Signed-off-by: Avi Kivity <avi@scylladb.com>
2019-03-19 11:56:32 +02:00
Tibor Vass
7ca2c3d68d contrib/nvidia: export helper binary path and list of Nvidia capabilities
Signed-off-by: Tibor Vass <tibor@docker.com>
2019-03-12 15:28:14 -07:00
zhangyue
996c60616a fix: fix error info start capitalized
Signed-off-by: zhangyue <zy675793960@yeah.net>
2018-11-28 15:26:16 +08:00
Jean Rouge
90880078b9 Adding a --load-kmods flag to the NVIDIA OCI hook
Signed-off-by: Jean Rouge <jer329@cornell.edu>
2018-11-15 01:52:11 -08:00
Mike Brown
6039a4d322 link to new icon location
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-10-27 10:23:56 -05:00
Sebastiaan van Stijn
07237e34e6
Bump to Go 1.11.x
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2018-10-25 22:13:21 +02:00
nashasha1
7f03ad6579 Fix typos
Signed-off-by: nashasha1 <a4012017@sina.com>
2018-09-07 16:59:42 +08:00
Kenfe-Mickaël Laventure
875b92c507
Merge pull request #2512 from crosbymichael/gpupath
Add nvidia Opts to lookup containerd binary or hook path
2018-07-31 09:28:33 -07:00
Michael Crosby
e4f33dcfb5 Add nvidia Opts to lookup containerd binary or hook path
This is for consumers like Docker that manage a `docker-containerd`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-31 10:11:25 -04:00
Michael Crosby
81e2859e8b Change gpu Capability type to string
This helps with mappings so that we are not translating multiple times
from caller to hook.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-30 15:37:13 -04:00
Derek McGowan
ca71484793
Merge pull request #2480 from dmcgowan/proxy-plugin-doc
Document plugins
2018-07-30 11:23:24 -07:00
Michael Crosby
dd0c04970d nvidia GPU support for caps and multiple uuids
This improves nvidia support for multiple uuids per container and fixes
the API to add individual capabilities.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-07-27 15:28:59 -04:00
Derek McGowan
3e657de3af
Document plugins
Add plugins documentation to root.
Mention configuring proxy plugins and runtime plugins.

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
2018-07-25 23:28:09 -07:00
Lantao Liu
0a5c05bcd4
Merge pull request #776 from Random-Liu/disable-streaming
Disable TLS streaming to work with new kubelet streaming proxy.
2018-06-01 00:48:44 -07:00
Lantao Liu
6c7ec48daf Another logo fix.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-05-21 18:05:30 -07:00
Lantao Liu
6f43d493f9 Disable TLS streaming to work with new kubelet streaming proxy.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-05-18 19:02:03 -07:00
Michael Crosby
b949697a9c Add nvidia gpu support via libnvidia-container
This adds nvidia gpu support via the libnvidia-container project and
`nvidia-container-cli`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-05-09 13:37:39 -04:00
Tom Godkin
fc8bce59b9 Use user-specific temp directory if set
This allows non-privileged users to use containerd. This is part of a
larger track of work integrating containerd into Cloudfoundry's garden
with support for rootless.

[#156343575]

Signed-off-by: Claudia Beresford <cberesford@pivotal.io>
2018-05-04 10:27:58 +01:00
Lantao Liu
06f53b4838 Add unix:// prefix for socket addresses used by CRI remote client.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-20 17:36:25 -07:00
Lantao Liu
69b3f3aeac Add socat back.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-11 01:53:24 +00:00
abhi
f7a0b43734 Minor cleanup of comment in ansible
Signed-off-by: abhi <abhi@docker.com>
2018-04-09 15:57:24 -07:00
abhi
c200cb4642 Updating ansible installer
Signed-off-by: abhi <abhi@docker.com>
2018-04-09 14:31:49 -07:00
Lantao Liu
ad7bffc093 Enable TLS streaming in all the setup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-03 00:17:26 +00:00
Lantao Liu
b287fec35d Upgrade the tarball version in ansible.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-04-02 20:06:20 +00:00
Lantao Liu
c4f80aecb7
Merge pull request #711 from tklauser/libapparmor-dep
Drop libapparmor dependency from build docs
2018-04-02 11:55:27 -07:00
Tobias Klauser
d29678a3c4 Drop libapparmor dependency from build docs
As of opencontainers/runc@db093f6 runc no longer depends on libapparmor
thus libapparmor-dev no longer needs to be installed to build it or
anythind that depends on it (like containerd or cri-containerd). Adjust
the documentation accordingly.

containerd/containerd#2238 did the same for containerd.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2018-03-31 18:18:12 +02:00
Michael Crosby
606be14859
Merge pull request #2238 from tklauser/runc-libapparmor-dep
Drop libapparmor dependency from runc build docs
2018-03-30 10:18:34 -04:00
Tobias Klauser
a74903a307 Drop libapparmor dependency from runc build docs
As of opencontainers/runc@db093f621f runc
no longer depends on libapparmor thus libapparmor-dev no longer needs to
be installed to build it. Adjust the documentation accordingly.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
2018-03-29 09:18:45 +02:00
Justin Cormack
9435aeeb30
The set of bounding capabilities is the largest group
No capabilities can be granted outside the bounding set, so there
is no point looking at any other set for the largest scope.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-03-28 17:36:46 -07:00
Lantao Liu
ddda05211b Use systemd service cgroup and oom score adj.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-28 00:30:59 +00:00
Lantao Liu
f0655ecfe0 Use pause image from new source.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-26 07:11:41 +00:00
Nitesh Konkar
6a542c596b Bump pause container to multi-arch gcr.io/google-containers/pause:3.1
Signed-off-by: Nitesh Konkar <niteshkonkar@in.ibm.com>
2018-03-22 05:44:12 +00:00
Mike Brown
0ee7614785 docs update for cri-containerd to cri move
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-03-16 15:33:17 -05:00
Abhinandan Prativadi
ffda916fd0
Merge pull request #641 from Random-Liu/fix-ansible-doc
Require ansible 2.4+.
2018-03-05 21:39:22 -08:00
Lantao Liu
640e7ac2b0 Update ansible setup.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-06 00:05:02 +00:00
Lantao Liu
760248df77 Require ansible 2.4+.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-03-05 21:51:59 +00:00
Phil Estes
6aa612dfc2
Update recommended versions to Go 1.10
To match build requirements for containerd now that we are using 1.10.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2018-02-27 16:50:12 -08:00
Kunal Kushwaha
b12c3215a0 Licence header added
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2018-02-19 10:32:26 +09:00
Christopher Jones
8043f26651
[contrib] bump golang
Use golang:1.9, which should get the latest 1.9.x version,
instead of using a specific tag.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2018-02-16 08:23:35 -05:00
Justin Cormack
35be3d5127 Remove a really confusing fallthrough
This is so confusing, and not needed.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2018-02-08 16:22:29 +00:00
Christopher Jones
051ac5dd63
running tests in a container
This provides a dockerfile for building a container to run the containerd tests

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2018-01-30 14:44:30 -05:00
Michael Crosby
d179c61231 Revert "Use jsoniteer for faster json encoding/decoding"
This reverts commit 4233b87b89.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-29 15:47:48 -05:00
Michael Crosby
4233b87b89 Use jsoniteer for faster json encoding/decoding
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2018-01-26 16:32:55 -05:00
Lantao Liu
144ff3989b Update all glog flags to log-level.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-17 21:57:31 +00:00
Mike Brown
07c8f07ba3 fix kubernetes-incubator links
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2018-01-11 17:50:57 -06:00
Lantao Liu
025ffe551f Rename kubernetes-incubator/cri-containerd to containerd/cri-containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2018-01-10 22:35:33 +00:00
Lantao Liu
ec975b2e7a Add OS and arch in release tarball.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-13 23:03:03 +00:00
Lantao Liu
5a17149a70 Add LimitNPROC, LimitNOFILE and LimitCORE for containerd and
cri-containerd.

Signed-off-by: Lantao Liu <lantaol@google.com>
2017-12-01 00:16:58 +00:00
Daniel Nephin
cdf62f69a1 Fix usage of oci in other packages.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2017-11-27 16:16:17 -05:00
Antoine Huret
7814230fd9 contrib instead of contib
Signed-off-by: Antoine Huret <huret.antoine@yahoo.fr>
2017-11-26 16:54:30 +01:00
Wei Wei
53a4f93967 replace deprecated ansible include cmd
Signed-off-by: Wei Wei <weiwei.inf@gmail.com>
2017-11-06 15:06:46 +08:00
Lantao Liu
10ada61fe6 Update cri-containerd version to 1.0.0-alpha.1 in ansible.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-11-01 00:06:22 +00:00
Lantao Liu
95dfd3c039 Add runtime cgroup and put containerd and cri-containerd into it.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-31 06:21:20 +00:00
Lantao Liu
a7d12a1dd8 Remove the oom score in systemd unit. cri-containerd sets it by itself.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-10-12 17:32:20 +00:00
Lantao Liu
60ea331f9f Update ansible playbook release version.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-29 06:21:28 +00:00
Lantao Liu
8c7ddee69d Rename getting-started.md to README.md.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-28 23:11:00 +00:00
Abhinandan Prativadi
0ee33fda03 Combining few tasks into one
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-26 12:12:00 -07:00
Abhinandan Prativadi
b23165cb29 Merge pull request #282 from Random-Liu/fix-ansible-playbook
Improve ansible playbook.
2017-09-26 10:49:21 -07:00
Ian Campbell
99d4757ce6 contrib: add reference to LinuxKit project
Just a simple README with a pointer to the project.

Signed-off-by: Ian Campbell <ijc@docker.com>
2017-09-26 10:52:33 +01:00
Lantao Liu
c83af81403 Merge pull request #279 from abhinandanpb/readme
Getting started guide
2017-09-25 16:06:32 -07:00
Lantao Liu
994df4cb7c Improve ansible playbook.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-25 22:39:04 +00:00
Abhinandan Prativadi
300f0cf89e Create a getting started guide for users
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-25 14:04:54 -07:00
Lantao Liu
b2dcb9f3ec Add net.ipv4.ip_forward=1 and use ansible sysctl.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-22 23:36:12 +00:00
Abhinandan Prativadi
2dae863f87 Merge pull request #276 from abhinandanpb/master
Fixing ansible playbook for centos installation
2017-09-22 15:19:35 -07:00
Abhinandan Prativadi
ffd2e0e32e Fixing ansible playbook for centos installation
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-22 17:50:41 -04:00
Lantao Liu
7ab54a00da Use systemd units in tar.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-22 21:28:36 +00:00
Abhinandan Prativadi
bafc7be9be kubernetes + containerd installer
Signed-off-by: Abhinandan Prativadi <abhi@docker.com>
2017-09-20 22:32:09 -07:00
Mike Brown
120bb4cd47 fixes missing default permission
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-20 13:15:39 -05:00
Michael Crosby
58015abbd5 Add readme to contib
Closes #1442

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-09-18 11:47:27 -04:00
Mike Brown
426650f21b adds seccomp helpers
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2017-09-13 13:11:30 -05:00
Lantao Liu
8c6d5e0ca2 Add systemd unit files for containerd and cri-containerd.
Signed-off-by: Lantao Liu <lantaol@google.com>
2017-09-08 17:44:29 +00:00
Michael Crosby
2b46989dbe Add default apparmor profile generation
This adds default apparmor profile generation to the containerd client
so that profiles can be generated with a SpecOpt

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2017-08-29 12:03:24 -04:00