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
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
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
Mike Brown
1d3b9c5b80
Merge pull request #1532 from jsturtevant/update-pause-image-ref
...
Update to latest Windows SandboxImage
2020-07-15 17:55:28 -05:00
Davanum Srinivas
212c29833f
Updates to go-systemd and selinux
...
caught these when i was looking at cadvisor's deps.
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2020-07-15 17:08:34 -04:00
Derek McGowan
c763f3afc2
Merge pull request #4380 from estesp/clashing-containerds
...
Don't clash with GH Actions runner's containerd
2020-07-15 12:38:01 -07:00
James Sturtevant
2bb0b19c4b
Update to latest pause image for windows
...
Signed-off-by: James Sturtevant <jstur@microsoft.com>
2020-07-15 11:45:21 -07:00
Phil Estes
b47c7ec274
Update to later version of critools with timing fix.
...
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-07-15 14:43:58 -04:00
Phil Estes
7af3d7e176
Don't clash with GH Actions runner's containerd
...
GH runners now have a systemd-run containerd running on the standard
socket, impacting the CRI test's expectation of our CI-built containerd
running there.
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-07-15 13:57:32 -04:00
Phil Estes
d2776ef6bc
Merge pull request #4375 from AkihiroSuda/go-1.13.13
...
Bump Go 1.13.13
2020-07-15 08:44:08 -04: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
Phil Estes
4bec2dbd4f
Merge pull request #4373 from tonistiigi/darwin-variant-log
...
platforms: don’t log arm variant error on darwin
2020-07-14 11:36:29 -04:00
Tonis Tiigi
7119a2a152
platforms: don’t log arm variant error on darwin
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2020-07-14 08:16:14 -07:00
Derek McGowan
5d470fa23b
Merge pull request #4372 from dmcgowan/prepare-1.4-beta.2
...
Update version to 1.4.0-beta.2
2020-07-13 09:23:07 -07:00
Derek McGowan
fc04485186
Update version to 1.4.0-beta.2
...
Signed-off-by: Derek McGowan <derek@mcg.dev>
2020-07-13 07:42:50 -07:00
Akihiro Suda
9cd02b5953
Merge pull request #4371 from thaJeztah/bump_cgroups
...
vendor: containerd/cgroups 318312a373405e5e91134d8063d04d59768a1bff
2020-07-13 23:12:52 +09:00
Sebastiaan van Stijn
cc493eba3f
vendor: containerd/cgroups 318312a373405e5e91134d8063d04d59768a1bff
...
full diff: 0dbf7f05ba...318312a373
2020-07-13 14:54:05 +02:00
Mike Brown
5df93a038a
Merge pull request #1531 from mikebrow/nit-for-default-config
...
show runc options tag
2020-07-11 11:47:00 -05:00
Akihiro Suda
a6697c1d5f
Merge pull request #4369 from estesp/step-title
...
Make title similar with other CI workflow jobs
2020-07-11 14:59:58 +09:00
Mike Brown
4b3974c4e9
show runc options tag
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2020-07-10 16:33:36 -05:00
Phil Estes
3f427d3d63
Merge pull request #4367 from gaurav1086/TestExchangeFilters_fix_deadlock
...
[events/exchange_test] Fix deadlock in TestExchangeFilters
2020-07-10 15:12:15 -04:00
Phil Estes
7855b0a781
Make title similar with other CI workflow jobs
...
Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2020-07-10 15:03:26 -04:00
Mike Brown
a01750d89a
Merge pull request #1530 from hckuo/fix-doc-for-runtime-options
...
Fix doc for runtime specific options
2020-07-10 11:46:32 -05:00
HsuanChi (Austin) Kuo
904ab30f9d
Fix doc for runtime specifc options
...
Signed-off-by: Hsuan-Chi Kuo <hckuo2@illinois.edu>
2020-07-10 11:04:49 -05:00
Gaurav Singh
852587cd18
[events/exchange_test] Fix deadlock in TestExchangeFilters
...
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
Remove sync
Signed-off-by: Gaurav Singh <gaurav1086@gmail.com>
2020-07-10 10:27:42 -04:00
Wei Fu
334f567e01
Merge pull request #4366 from murat-kilic/update-build-doc-for-golang-req
...
Update build doc with Go 1.13 requirement
2020-07-09 11:23:25 +08:00
