Commit Graph

10590 Commits

Author SHA1 Message Date
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
Takumasa Sakao
4c8164bccf Specify version = 2 & fix wrong key in registry.md (GCR example)
Signed-off-by: Takumasa Sakao <sakataku7@gmail.com>
2020-07-28 17:54:12 +09: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
ktock
375dd76255 Add description about disable_snapshot_annotations to configuration doc
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-07-28 09:30:20 +09:00
ktock
c80660b82b Allow GC to discard content after successful pull and unpack
This commit adds a config flag for allowing GC to clean layer contents up after
unpacking these contents completed, which leads to deduplication of layer
contents between the snapshotter and the contnet store.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-07-28 09:05:47 +09:00
ktock
b51177bfcc Vendor containerd d184a0a343
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2020-07-27 10:48:20 +09: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
8448b92d23
Merge pull request #1534 from crosbymichael/selinux-range
Update selinux pkg and allow category range to be set in config
2020-07-23 15:32:55 -05: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
Mike Brown
0443a13da7
Merge pull request #1535 from lumjjb/updatecri-doc
Update doc cri plugin convention
2020-07-23 11:18:44 -05:00
Mike Brown
e080f84537
Merge pull request #1539 from mikebrow/windows-ci-force-bash
switching to windows-2016.. latest is breaking due to wsl conflict with bash
2020-07-23 10:11:13 -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
Mike Brown
fad87288f8 switching to windows-2016 latest is breaking due to wsl conflict with bash
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-22 17:33:45 -05:00
Brandon Lum
f93b72530f Update doc cri plugin convention
Signed-off-by: Brandon Lum <lumjjb@gmail.com>
2020-07-22 17:34:17 +00: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
Paul "TBBle" Hampson
06fb93e0f0 Reject host-mode networking on Windows
The flag was being silently ignored, and so no network setup was done,
and no notice given.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-21 19:43:08 +10:00
Paul "TBBle" Hampson
ca15cb0d81 Fix incorrect (cut-and-paste) method comment
Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-21 19:43:08 +10:00
Derek McGowan
c8b14ae4c0
Set content labels based on content type
Give control of the content labeling process for children to
the client. This allows the client to control the names
associated with the labels and filter out labels.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-07-21 00:46:07 -07:00
Brian Goff
d7b9cb0019 shim: move event context timeout to publsher
Before this change, if an event fails to send on the first attempt,
subsequent attempts will fail with context.Cancelled because the the
caller of publish passes a cancellable timeout, which the publisher uses
to send the event.

The publisher returns immediately if the send fails, but adds the event
to an async queue to try again.
Meanwhile the caller will return cancelling the context.

Additionally, subsequent attempts may fail to send because the timeout
was expected to be for a single request but the queue sleeps for
`attempt*time.Second`.

In the shim service, the timeout was set to 5s, which means the send
will fail with context.DeadlineExceeded before it reaches `maxRequeue`
(which is currently 5).

This change moves the timeout to the publisher so each send attempt gets
its own timeout.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2020-07-20 17:51:10 -07:00
Maksym Pavlenko
ec05460c1d
Merge pull request #4408 from AkihiroSuda/cgroup2-runc
cgroup2 CI: add RUNC_FLAVOR=runc
2020-07-20 14:09:33 -07:00
Michael Crosby
5f5d954b6a add selinux category range to config
This allows an admin to set the upper bounds on the category range for selinux
labels.  This can be useful when handling allocation of PVs or other volume
types that need to be shared with selinux enabled on the hosts and volumes.

Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-20 16:02:07 -04:00
Michael Crosby
9b06da4773 update selinux to 1.6.0 release
Signed-off-by: Michael Crosby <michael@thepasture.io>
2020-07-20 15:57:28 -04:00
Akihiro Suda
b97c660e16
cgroup2 CI: add RUNC_FLAVOR=runc
Previously we were only testing cgroup2 with crun

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-20 17:53:41 +09:00
Akihiro Suda
1a7bbd1f71
vendor: update containerd/cri
Changes: 8fb244a65b...fcda0cf4a7

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-20 13:14:11 +09:00
Sherif
96099550b5
parseIDMapping: accept 32-bit IDs
Signed-off-by: Sherif Mowafy <sherif.mowafy@gmail.com>
2020-07-19 10:09:51 +02:00
Wei Fu
e818fe27ce
Merge pull request #4346 from AkihiroSuda/ci-cgroup2
CI: run CRI tests on Fedora 32
2020-07-18 11:18:02 +08:00
Akihiro Suda
c2c9f4420a
Merge pull request #4398 from thaJeztah/bump_golang_1.13.14
Bump Golang 1.13.14
2020-07-18 10:17:31 +09: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
Phil Estes
4feb8c4623
Merge pull request #4383 from dims/update-to-go-systemd-and-selinux-deps
Updates to go-systemd and selinux
2020-07-16 21:49:06 -04:00
Kazuyoshi Kato
c383436af7 snapshots/devmapper: suspend a device to avoid data corruption
According to https://github.com/torvalds/linux/blob/v5.7/Documentation/admin-guide/device-mapper/thin-provisioning.rst#internal-snapshots;

> If the origin device that you wish to snapshot is active, you
> must suspend it before creating the snapshot to avoid corruption.

However the devmapper snapshotter was not doing that.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2020-07-16 15:08:07 -07:00
Maksym Pavlenko
56c440ec7f
Merge pull request #4393 from TBBle/annotate_bare_errnotimplemented
Annotate bare ErrNotImplemented returns
2020-07-16 13:38:56 -07:00
Mike Brown
fcda0cf4a7
Merge pull request #1529 from AkihiroSuda/allow-disabling-hugepages
allow disabling hugepages
2020-07-16 13:29:46 -05:00
Paul "TBBle" Hampson
71f11db8a3 Annotate bare ErrNotImplemented returns
This makes it possible to see _what_ is not implemented from the caller.

Signed-off-by: Paul "TBBle" Hampson <Paul.Hampson@Pobox.com>
2020-07-16 20:16:11 +10:00
Akihiro Suda
061d338ec2
CI: run CRI tests on Fedora 32
SELinux is currently disabled

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-16 17:27:43 +09:00
Maksym Pavlenko
4318fa9c1f
Merge pull request #4376 from AkihiroSuda/test-v1-shim
CI: add back shim v1 test
2020-07-15 22:21:12 -07:00
Maksym Pavlenko
3560a453e4
Merge pull request #4385 from AkihiroSuda/fix-cri-dead-link
RELEASES.md: fix a dead link
2020-07-15 22:19:46 -07:00
Akihiro Suda
707d2c49d1
allow disabling hugepages
This helps with running rootless mode + cgroup v2 + systemd without hugetlb delegation.
Systemd does not (and will not, perhaps) support hugetlb delegation as of systemd v245. https://github.com/systemd/systemd/
issues/14662

From 502bc5427e/src/patches/containerd/0001-DIRTY-VENDOR-cri-allow-disabling-hugepages.patch

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-16 11:46:25 +09:00
Akihiro Suda
decbb04997
RELEASES.md: fix a dead link
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-16 11:21:06 +09:00
Derek McGowan
f4ebe02f98
Merge pull request #4377 from AkihiroSuda/ci-remove-unreferenced-variable
CI: remove an unreferenced variable
2020-07-15 18:40:58 -07:00
Akihiro Suda
b2ee43206b
CI: add back shim v1 test
We are going to deprecate shim v1 (#4365), but it is still early to
disable the tests for them

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-16 10:40:47 +09:00
Akihiro Suda
c4418bb3a8
CI: remove an unreferenced variable
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2020-07-16 10:23:43 +09:00