Commit Graph

8706 Commits

Author SHA1 Message Date
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
Mike Brown
c209d013cb
Merge pull request #1545 from ktock/ssdoc
Add description about `disable_snapshot_annotations` to configuration doc
2020-07-29 11:48:30 -05:00
Mike Brown
fe9bb8da65
Merge branch 'master' into ssdoc 2020-07-29 11:44:10 -05:00
Mike Brown
63400c7694
Merge pull request #1543 from ktock/discard-content
Allow GC to discard content after successful pull and unpack
2020-07-29 11:39:28 -05: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
Akihiro Suda
0f99e0f53e
Merge pull request #1542 from sachaos/master
Update config syntax in registry.md (GCR example)
2020-07-29 02:30:20 +09: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
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