Commit Graph

6020 Commits

Author SHA1 Message Date
Jacob Blain Christen
b4376e9865 Update Vagrantfile for testing SELinux
`vagrant up` will build and install containerd and all dependencies,
setting up proper SELinux contexts on the runc and containerd binaries.
The VM is configured to be SELinux Enforcing by default but this gets
changed during various CI passes via a matrix param to Disabled and
Permissive before running tests. I have an open PR to fix the
container-selinux policy for containerd at
https://github.com/containers/container-selinux/pull/98 which once
accepted we will want to update the CI matrix to use Enforcing mode
instead of Permissive.

All tests currently pass in SELinux permissive mode with containerd
configured with `enable_selinux=true`. To see which tests are failing
with SELinux enforcing and an already spun up VM:
`SELINUX=Enforcing vagrant up --provision-with=selinux,test-cri`
To test SELinux enforcing in a new VM:
`vagrant destroy -force; SELINUX=Enforcing vagrant up --provision-with=shell,selinux,test-cri`

The `selinux` shell provisioner, parameterized by the SELINUX envvar,
will configure the system as you would expect, with the side effect that
containerd is configured with `enable_selinux=true` via
`/etc/containerd/config.toml` for Permissive or Enforcing modes and
`enable_selinux=false` when SELINUX=Disabled.

Provided that virtualization is suported, this Vagrantfile and provisioners
make it easy to test containerd/cri for conformance under SELinux on
non-SELinux systems.

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
2020-08-10 01:55:44 -07:00
Wei Fu
23934e8686 Merge pull request #4462 from thaJeztah/bump_golang_1.13.15
Bump Golang 1.13.15
2020-08-09 10:41:37 +08: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
Akihiro Suda
3cdc7bf13d Merge pull request #4457 from thaJeztah/bump_cri_tools
Update cri-tools to v1.18.0-100-g2bf7674 for Go 1.15 compatibility
2020-08-06 09:21:39 +09:00
Sebastiaan van Stijn
3cc2be2a87 Update cri-tools to v1.18.0-100-g2bf7674 for Go 1.15 compatibility
full diff: 16911795a3...2bf7674922

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-08-05 13:17:11 +02:00
Derek McGowan
85b15eff45 Merge pull request #4449 from dmcgowan/prepare-1.4.0-rc.0
Prepare 1.4.0-rc.0 release
2020-08-04 10:57:07 -07:00
Derek McGowan
6288559231 Prepare 1.4.0-rc.0 release
Move beta release notes and update version

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-08-03 22:22:53 -07:00
Maksym Pavlenko
666198cd2a Merge pull request #4446 from kzys/devmapper-platform
snapshots/devmapper: don't hardcord the platform strings
2020-08-03 13:11:38 -07:00
Kazuyoshi Kato
74e9aa7abb snapshots/devmapper: don't hardcord the platform strings
The snapshotter doesn't have to exclude non-amd64 platforms.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-08-03 11:55:36 -07:00
Akihiro Suda
0f08a55d6b Merge pull request #4413 from dmcgowan/registry-proxy-ns
Add namespace query parameter for registry proxying
2020-08-04 01:58:52 +09:00
Derek McGowan
adeba792f1 Add namespace query parameter for registry proxying
Proxy registries are designed to serve content from upstreams.
However, the proxy hostname will usually not match the hostname
of the upstream, requiring the proxy to only use a single
upstream or use its own pattern matching to determine the upstream.
To solve this issue, the client will pass along the namespace which
is being used for the request, allowing mirrors to easily map
to multiple upstreams. This query parameter can safely be ignored
if multiple upstreams are not supported.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-08-03 09:32:44 -07:00
Akihiro Suda
49837814b3 Merge pull request #4433 from Yikun/enable-new-nodeset
Change nodeset to `ubuntu-xenial-arm64-openlab`
2020-08-03 16:26:38 +09:00
Maksym Pavlenko
bd92d567a5 Merge pull request #4442 from estesp/noop-deps
Remove seccomp/Linux deps steps in GH Actions
2020-07-31 16:13:34 -07:00
Phil Estes
5a190c7077 Remove seccomp/Linux deps steps in GH Actions
Recent changes removed the need for libseccomp-dev when building
containerd. The btrfs tools package is already installed on GH Actions
runners and was already a no-op so the whole step can be removed.

Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-07-31 11:25:26 -04:00
Phil Estes
6162ae93db Merge pull request #4439 from AkihiroSuda/cri-20200731
vendor: update cri (no more libseccomp cgo dependency)
2020-07-31 11:21:11 -04:00
Akihiro Suda
6988b4d640 remove seccomp buildtag
The cgo dependency on libseccomp was removed in containerd/cri#1548.

The `seccomp` build tag is now ignored (and the seccomp support is always built-in).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-31 14:41:41 +09:00
Akihiro Suda
362b7167a7 vendor: update cri (no more libseccomp cgo dependency)
8448b92d23...8871d5cdf8

The cgo dependency on libseccomp was removed in containerd/cri#1548.

The `seccomp` build tag is now ignored (and the seccomp support is
always built-in).

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-31 14:32:08 +09:00
Wei Fu
df8352f1ff Merge pull request #4335 from ktock/sn-doc
Add doc about snapshotter based on shared remote storage
2020-07-30 23:19:59 +08:00
Wei Fu
4a96be9795 Merge pull request #4431 from TBBle/import_manifest_for_test_binary
Import Windows manifest into test build, rather than copying by script
2020-07-30 23:13:15 +08:00
Michael Crosby
fa1220fce3 Merge pull request #4436 from tonistiigi/tokenscopes-public
remotes: mark GetTokenScopes public
2020-07-30 11:07:46 -04:00
Tonis Tiigi
03b5a053ea remotes: mark GetTokenScopes public
Authorizer interface can’t be really implemented because
scopes are passed in on a side channel via private value in context.


Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-07-29 23:01:36 -07:00
Akihiro Suda
779ef60231 Merge pull request #4435 from tao12345666333/update-runc
vendor runc library to v1.0.0-rc91-48-g67169a9d
2020-07-30 13:10:51 +09:00
Yikun Jiang
b43a01a221 Change nodeset to ubuntu-xenial-arm64-openlab
The old nodeset is unstable and apt source is unavailable, we change the nodeset from `ubuntu-xenial-arm64` to `ubuntu-xenial-arm64-openlab` to enable stable new nodeset.

Signed-off-by: Yikun Jiang <yikunkero@gmail.com>
2020-07-30 09:22:38 +08:00
Derek McGowan
c2a6f180d7 Merge pull request #4428 from thaJeztah/bump_continuity
vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
2020-07-29 12:33:31 -07:00
Derek McGowan
d4b17275d6 Merge pull request #4384 from AkihiroSuda/deprecate-legacy-shims
Deprecate legacy shims
2020-07-29 11:30:09 -07:00
Akihiro Suda
04b98bb0ee Deprecate legacy shims
Fix #4365

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-30 01:57:12 +09:00
Derek McGowan
40b22ef074 Merge pull request #4429 from crosbymichael/task-spec
Add Spec() method to task
2020-07-29 09:35:37 -07:00
Akihiro Suda
9a3e95d351 Merge pull request #4430 from crosbymichael/ctr-cpus
Add --cpus flag to ctr
2020-07-30 01:27:00 +09:00
Jintao Zhang
b870231854 vendor runc library to v1.0.0-rc91-48-g67169a9d
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
2020-07-29 14:52:48 +08:00
Michael Crosby
02afa94256 Add --cpus flag to ctr
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-28 23:06:07 -04:00
Paul "TBBle" Hampson
aa56cfc0a8 Import Windows manifest into test build, rather than copying by script
This will ensure that we can always get the current Windows OS build
version, without being put into Windows 8 compatibility mode.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-29 06:02:35 +10:00
Phil Estes
eb6354a118 Merge pull request #4427 from TBBle/test_improvements
Some small test improvements
2020-07-28 14:36:44 -04:00
Sebastiaan van Stijn
5b1627410d vendor: update containerd/continuity efbc4488d8fe1bdc16bde3b2d2990d9b3a899165
full diff: d3ef23f19f...efbc4488d8

Fix sameFile() to recognize empty files as the same
  - fixes "Empty files can diff as "modified" even when they're not"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2020-07-28 16:39:35 +02:00
Paul "TBBle" Hampson
1ec1e9eabf Add Windows 10/Windows Server 2004 for integration tests
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-28 22:36:00 +10:00
Paul "TBBle" Hampson
faa4ff56e4 Usefully fail tests with unknown or bad Windows Build version
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-28 22:35:33 +10:00
Paul "TBBle" Hampson
3795dd41ae Always report server log from verbose integration test runs
If you're adding `-v` to TESTFLAGS, you probably want to see the server
logs, as well as the extra output from the testing framework.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-28 22:33:59 +10:00
Michael Crosby
4318f93f9c Add Spec() method to task
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-27 21:32:15 -04:00
Akihiro Suda
d184a0a343 Merge pull request #4414 from dmcgowan/discard-content
Set content labels based on content type
2020-07-24 16:31:46 +09:00
Derek McGowan
67f19bfdd8 Merge pull request #4388 from AkihiroSuda/fix-mount-wait-no-child-processes
mount: retry executing the helper binary on ECHILD
2020-07-23 23:20:16 -07:00
Mike Brown
3c2a77bd79 Merge pull request #4421 from crosbymichael/selinux-range
update cri to 8448b92d23
2020-07-23 16:54:13 -05:00
Derek McGowan
cf99e16cd0 Merge pull request #4420 from mikebrow/cni-config-update
update for CI warning
2020-07-23 14:53:40 -07:00
Michael Crosby
3611efdcef update cri to 8448b92d23
This includes an update of the selinux package and the ability in the CRI
configuration to set the upper bounds for the selinux category labels that are
generated.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-23 17:11:18 -04:00
Mike Brown
1b320bcc26 update for cni config
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-23 13:41:14 -05:00
ktock
c2081369c5 Add doc about remote snapshotter
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-07-23 13:05:05 +09:00
Akihiro Suda
403dc83a29 mount: retry executing the helper binary on ECHILD
`exec.CombinedOutput()` intermittently returns `ECHILD` due to our
signal handling.

`wait(2)`: https://man7.org/linux/man-pages/man2/wait.2.html

> ECHILD (for waitpid() or waitid()) The process specified by pid
>   (waitpid()) or idtype and id (waitid()) does not exist or is
>   not a child of the calling process.  (This can happen for
>   one's own child if the action for SIGCHLD is set to SIG_IGN.
>   See also the Linux Notes section about threads.)

Fix #4387

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-22 14:24:08 +09:00
Wei Fu
1a571fcf1b Merge pull request #4374 from kzys/suspend-devmapper
snapshots/devmapper: suspend a device to avoid data corruption
2020-07-22 11:36:31 +08:00
Wei Fu
59e1aa963f Merge pull request #4407 from AkihiroSuda/cri-20200720
vendor: update containerd/cri
2020-07-22 11:20:43 +08:00
Wei Fu
2cc2414ec5 Merge pull request #4412 from cpuguy83/shim2_event_cancelled
shim: move event context timeout to publsher
2020-07-22 11:14:54 +08:00
Maksym Pavlenko
97c081c84b Merge pull request #4410 from TBBle/minor_windows_fixes
Minor fixes around Windows network setup
2020-07-21 15:26:18 -07:00
Maksym Pavlenko
e6306f9fdf Merge pull request #4401 from smowafy/parse-id-mappings
parseIDMapping: accept 32-bit IDs
2020-07-21 12:00:59 -07:00