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

9118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
3f95bc5f18
Merge pull request #4213 from fahedouch/remove_unnecessary_condition 
remove if condition because it is handled by the sdNotify daemon func
 2020-04-27 10:57:56 -04:00
Dave Syer
5ac8515bf0 Clarify that plugin names are long in version = 2 
Otherwise it's confusing for readers who just need quick reference
for plugin configurations.

Signed-off-by: Dave Syer <dsyer@pivotal.io>
 2020-04-27 14:35:41 +01:00
Mike Brown
4ea4ca99c7
Merge pull request #1455 from 6WIND/master 
fix incomplete host device for PrivilegedWithoutHostDevices
 2020-04-26 22:28:20 -05:00
Wei Fu
197dca5a35
Merge pull request #1464 from mikebrow/test-apparmor-profile 
move up to latest critools; add apparmor profile check
 2020-04-27 11:16:28 +08:00
fahedouch
8e76d18eff remove if condition because it is handled by the sdNotify daemon func 
Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>

lint code

Signed-off-by: fahedouch <fahed.dorgaa@gmail.com>
 2020-04-26 23:18:34 +02:00
Mike Brown
776c125e4f move up to latest critools; add apparmor profile check 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-26 16:16:48 -05:00
Brian Goff
1a10211e3f WithLease: always return context and done fn 
We should never return a nil context because of the way this function is
typically used... e.g.

```
  ctx, done, err := containerd.WithLease(ctx)
```

If there is an error `ctx` will be nil and any error handling may cause
an NPE if it tries to use `ctx`.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-04-25 21:16:43 -07:00
Brian Goff
98b30f4690 Add commands to mount/unmount image from ref 
Example:

```terminal
$ mkdir /opt/busybox
$ ctr image mount docker.io/library/busybox:latest /opt/busybox
/opt/busybox
$ ls -lh /opt/busybox
total 40K
drwxr-xr-x 2 root   root     12K Apr 14 01:10 bin
drwxr-xr-x 2 root   root    4.0K Apr 14 01:10 dev
drwxr-xr-x 3 root   root    4.0K Apr 14 01:10 etc
drwxr-xr-x 2 nobody nogroup 4.0K Apr 14 01:10 home
drwx------ 2 root   root    4.0K Apr 14 01:10 root
drwxrwxrwt 2 root   root    4.0K Apr 14 01:10 tmp
drwxr-xr-x 3 root   root    4.0K Apr 14 01:10 usr
drwxr-xr-x 4 root   root    4.0K Apr 14 01:10 var
$ ctr image unmount /opt/busybox
$ ls -lh /opt/busybox
total 0
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-04-25 21:00:21 -07:00
Phil Estes
36952e989a
Merge pull request #4208 from estesp/moar-startup-time 
Allow more time for containerd to start for integration
 2020-04-23 14:35:25 -04:00
Phil Estes
5d4a9bae9f
Merge pull request #4199 from fuweid/update-go-version-zuul 
.zuul: update go version to 1.13.10
 2020-04-23 14:35:10 -04:00
Phil Estes
cd0e62f5c9
Allow more time for containerd to start for integration 
Currently hardcoded to 2 seconds; in GitHub actions we see random
cancellation of our integration suite right at 2 seconds even
though containerd is within milliseconds of being ready.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-23 11:23:38 -04:00
Mike Brown
14c4b47bb1
Merge pull request #1459 from mikebrow/containerd-project-readme 
link readme to containerd/project
 2020-04-23 10:19:34 -05:00
Mike Brown
6b01946938 link readme to containerd/project repo 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-23 09:26:12 -05:00
Wei Fu
9687ba6315 test: TestRuntimeWithEmptyMaxEnvProcs should cleanup 
TestRuntimeWithEmptyMaxEnvProcs should restore the GoMaxProcs after
test so that the temporary change of GoMaxProcs will not impact other
case, like TestRuntimeWithNonEmptyMaxEnvProcs.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-04-23 22:09:10 +08:00
Wei Fu
b566859acc .zuul: update go version to 1.13.10 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-04-23 22:09:10 +08:00
Mike Brown
2db26cc9f0
Merge pull request #1458 from mikebrow/copyright-alignment 
use containerd/project header test
 2020-04-23 07:32:13 -05:00
Phil Estes
4147010574
Merge pull request #1457 from hickeyma/fix-docs 
Add improvement to docs
 2020-04-23 08:29:16 -04:00
Martin Hickey
02307da36d Add improvement to docs 
Some small improvements to docs of things I found while
using the docs.

Signed-off-by: Martin Hickey <martin.hickey@ie.ibm.com>
 2020-04-23 09:47:54 +00:00
Mike Brown
1b60224e2e use containerd/project header test 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-22 19:35:37 -05:00
Maksym Pavlenko
e094d363ac
Merge pull request #4206 from estesp/fix-golang-lint 
Fix retrieval of golangci-lint specific version
 2020-04-22 12:24:49 -07:00
Phil Estes
32649fe305
Fix retrieval of golangci-lint specific version 
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-22 14:45:31 -04:00
Thibaut Collet
98f8ec4995 fix incomplete host device for PrivilegedWithoutHostDevices 
For a privilege pods with PrivilegedWithoutHostDevices set to true
host device specified in the config are not provided (whereas it is done for
non privilege pods or privilege pods with PrivilegedWithoutHostDevices set
to false as all devices are included).

Add them in this case.

Fixes: 3353ab76d9 ("Add flag to overload default privileged host device behaviour")
Signed-off-by: Thibaut Collet <thibaut.collet@6wind.com>
 2020-04-22 18:20:36 +02:00
Derek McGowan
befc70b444
Merge pull request #1456 from mikebrow/fix-deprecated-greeting 
remove broken greetings github action
 2020-04-21 15:57:42 -07:00
Mike Brown
f673f0cf5c remove greetings due to security issue 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-21 17:00:45 -05:00
Wei Fu
6b669315bc
Merge pull request #1454 from mikebrow/project-dco-integration-for-make 
use project dco test locally
 2020-04-21 23:00:13 +08:00
Wei Fu
a45f57bcf1
Merge pull request #1375 from jdewinne/registry-doc 
Update registry.md for auth config
 2020-04-21 16:25:08 +08:00
Joris De Winne
050e8c63c0
Update registry.md for auth config 
Signed-off-by: Joris De Winne <joris.dewinne@gmail.com>
 2020-04-20 21:19:35 -07:00
Mike Brown
0049d4f973 use project dco test locally 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-20 14:57:07 -05:00
Phil Estes
1d083fec49
Merge pull request #4198 from fuweid/ignore-ttrpc-closed 
runtime: ignore ttrpc closed error
 2020-04-20 12:32:26 -04:00
Wei Fu
126e497e63 vendor: update ttrpc with 6e416eafd26e6e738df716b21d421d5b59702bb4 
Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-04-20 23:35:18 +08:00
Wei Fu
0116352e1b runtime: ignore ttrpc.ErrClosed when delete task 
For some reason, shimv2 process doesn't exist. The ttrpc doesn't detect
the connection closed by server until delete task. For this case, we
should ignore the ttrpc.ErrClosed and let task manager handle the
cleanup.

Signed-off-by: Wei Fu <fuweid89@gmail.com>
 2020-04-20 23:34:49 +08:00
Mike Brown
9d37687a95
Merge pull request #1436 from chethanah/add-container-name-annot 
Support for additional OCI annotations: 'container-name'
 2020-04-19 13:19:47 -05:00
Wei Fu
f3e44466d6
Merge pull request #1451 from mikebrow/split-validate-from-build-and-test 
split tests and some refactoring
 2020-04-19 10:30:55 +08:00
Wei Fu
5bfab78acd
Merge pull request #4195 from mxpv/binary-io 
Binary IO fixes and tests
 2020-04-19 10:26:44 +08:00
Derek McGowan
4f6c594de3
Merge pull request #4194 from cpuguy83/remove_subreaper_config 
This config no longer exists, so remove from docs.
 2020-04-18 11:13:58 -07:00
Maksym Pavlenko
917e7646ae Add binary IO tests 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-04-17 16:50:43 -07:00
Maksym Pavlenko
9175401b28 Cleanup binary IO resources on error 
Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-04-17 15:56:21 -07:00
Maksym Pavlenko
0dc7c85956 Don't use timeout package when stopping shim logger 
containerd loads timeout values from config.toml and populated those
values to `timeout` package at launch. So when using `timeout` package
from shim, there are default values and config file is ignored.
So use a hardcoded value for binary IO.

Signed-off-by: Maksym Pavlenko <makpav@amazon.com>
 2020-04-17 15:06:18 -07:00
Brian Goff
8574083153 This config no longer exists, so remove from docs. 
This was changed to `no_subreaper` in
6e9f24b711 and, as far as I can tell,
`no_subreaper` doesn't exist as a config anymore.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2020-04-17 14:14:35 -07:00
Mike Brown
b838ac8c2e split tests and some refactoring 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-17 15:32:37 -05:00
Mike Brown
c6c9268eb0
Merge pull request #1450 from yylt/add-scheme-endpoint 
add default scheme when mirrors no scheme
 2020-04-17 12:00:48 -05:00
yang yang
d07f7f167a add default scheme if endpoint no scheme 
Signed-off-by: yang yang <yang8518296@163.com>
 2020-04-17 23:33:28 +08:00
Akihiro Suda
d8506bfd7b
Merge pull request #4193 from ktock/bump_cri 
vendor: update containerd/cri 61b7af7564
 2020-04-17 16:36:18 +09:00
ktock
e79d666cdd vendor: update containerd/cri 61b7af7564 
full diff: 92cb4ed978..61b7af7564

This adds new dependency github.com/fsnotify/fsnotify since 4ce334aa49

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
 2020-04-17 12:31:30 +09:00
Mike Brown
61b7af7564
Merge pull request #1446 from mikebrow/remove-travis 
have moved these tests to github actions
 2020-04-16 18:56:49 -05:00
Mike Brown
27f911d663 removes the error when tls is configured for https but http is tried first 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-16 13:23:56 -05:00
Mike Brown
3fc5a909d1 have moved these tests to github actions 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2020-04-16 12:17:21 -05:00
Mike Brown
7ccd3f7d7e
Merge pull request #1431 from ktock/stargz 
Enable to pass additional handler on pull for stargz-based remote snapshots
 2020-04-16 12:02:02 -05:00
Derek McGowan
aa6a66b65e
Merge pull request #4192 from estesp/disable-travis-on-master 
Disable Travis CI on master
 2020-04-16 09:04:57 -07:00
Phil Estes
61597b4317
Disable Travis CI on master 
This allows Travis to continue running on PRs for release/1.x branches
where we have not enabled GH Actions.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
 2020-04-16 11:10:08 -04:00