Commit Graph

10081 Commits

Author SHA1 Message Date
Fabiano Fidêncio
87a2e0b2a2 runtime,v2: Enable debug when containerd is on debug+ log level
Currently the shimv2 debug is only enabled when containerd is,
specifically, on debug mode.  However, it should be enabled whenever the
CRI runtime is on debug *or any other lower* mode, as in trace mode.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
2021-06-17 12:43:02 +02:00
Fu Wei
11304a4ac8
Merge pull request #5611 from cloudtogo/rootfs-propagation
ctr flags of container rootfs propagation
2021-06-17 11:30:14 +08:00
kh
05e51539a9 command line flags of setting container rootfs propagation
Signed-off-by: Kitt Hsu <kitt.hsu@gmail.com>
2021-06-17 10:03:37 +08:00
Phil Estes
394f864750
Re-enable criu in main integration runs
Ubuntu kernel updates claim that the criu+overlayfs bug is finally fixed
in released kernels.

Signed-off-by: Phil Estes <estesp@amazon.com>
2021-06-16 17:46:27 -04:00
Jiaming Xu
1dada3fc2a add cgroupv2 setup for cos with a flag
Signed-off-by: Jiaming Xu <jiamingxu@google.com>

address feedbacks
2021-06-16 14:37:44 -04:00
Phil Estes
0631cec6e3
Merge pull request #5612 from cpuguy83/update_gotestsum
Update gotestsum to add timestamps to junit output
2021-06-16 14:35:06 -04:00
Brian Goff
bfbebf02b7 Update gotestsum to add timestamps to junit output
The current release of gotestsum is missing timestamps in the junit
data, which makes it difficult to import in an external system later.

https://github.com/gotestyourself/gotestsum/commit/012a85e34a7ce5554057d512e55dcb
includes the necessary changes to add the timestamp for the test run to
the junit output.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2021-06-16 16:17:40 +00:00
Enrico Weigelt, metux IT consult
2bb8ad7c9e Makefile: pass build tags to manpage build process
The 'go run' command in manpage build stage currently doesn't know about
build tags yet. This could lead to strange effects when eg. optional deps
are switched off.

Therefore also pass the tags to the 'go run' calls.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2021-06-15 20:58:13 +02:00
Enrico Weigelt, metux IT consult
f60d447c16 Makefile: fix tags parameter computation
In the current implementation, the build tags arguments can catch up an
extra trailing whitespace. Since this parameter is passed in quotes, the
shell won't strip it, leading to the wrong tags passed.

Therefore just strip it explicitly.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2021-06-15 20:58:07 +02:00
Phil Estes
0a3a77bc44
Merge pull request #5604 from ktock/nvidiacgroups
Allow to pass --no-cgroups option to nvidia-container-cli
2021-06-14 14:35:00 -04:00
ktock
9c01fe20d3 Allow to pass --no-cgroup option to nvidia-container-cli
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2021-06-14 23:58:22 +09:00
Phil Estes
fdfe01d7d3
Merge pull request #5577 from oss-qm/submit/fhs-manpage
Makefile: FHS conformant manpage installation pathes
2021-06-11 14:09:07 -04:00
Enrico Weigelt, metux IT consult
77374e8b35 Makefile: FHS conformant manpage installation pathes
FHS mandates manpages should go to /usr/share/man (or /usr/local/share/man,
for site local installations) -- /usr/man was an fallout of some ancient
Unices that haven't been fully FHS conformant and usually just a symlink to
/usr/share/man, if existing at all.

Distros sometimes need to override this (eg. MVCC installs), therefore go
the 30+ years common practise way and introduce MANDIR environment variable.
Since it's a subdir under the prefix for general constant and machine
architecture independ data -- which in turn also sometimes wants to be
overridden by distros, it shall be derived from DATADIR variable.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2021-06-10 19:07:15 +02:00
Phil Estes
2076dc6ffa
Merge pull request #5594 from estesp/go-for-project-checks
Add proper Go version before project checks
2021-06-10 12:03:35 -04:00
Phil Estes
3ab9744336
Add proper Go version before project checks
Due to a change in Go, the go.mod file cannot declare a version of Go
above the installed `go version`; until the default Go version in GitHub
actions virt environments is 1.16, we have to install 1.16 before
running the project checks now.

Signed-off-by: Phil Estes <estesp@amazon.com>
2021-06-10 10:48:25 -04:00
Phil Estes
a545df345e
Merge pull request #5580 from adelina-t/enable_cri_integration
Enable cri-integration in Windows Periodic Tests
2021-06-09 09:48:43 -04:00
Adelina Tuvenie
af5a130bc9 Enable cri-integration in Windows Periodic Tests
Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-06-08 17:53:29 +03:00
Fu Wei
2f0342fb54
Merge pull request #5573 from mikebrow/seccomp-doc-nit
adds explanation for seccomp unset/unconfined default vs runtime default
2021-06-08 08:13:27 +08:00
Mike Brown
7a2b04758b adds explanation for seccomp unset/unconfined default vs runtime default
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-06-07 17:57:18 -05:00
Phil Estes
7d77b51b49
Merge pull request #5569 from tnqn/teardown-network-timeout
Fix cleanup context of teardownPodNetwork
2021-06-07 14:46:45 -04:00
Phil Estes
68d69b7bda
Merge pull request #5572 from dims/update-integration/client-go.sum
update integration/client go.sum
2021-06-07 12:19:43 -04:00
Davanum Srinivas
01585595a5
update integration/client go.sum
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-06-07 09:12:41 -04:00
Adelina Tuvenie
419d616fec Install specific golang version in Windows CI.
For Periodic Windows runs we installed the latest available golang version.
It seems 1.16.5 is creating problems with go.sum. We now introduce the
ability to install specific versions for required packages when preparing
the testing env.

Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-06-07 15:17:02 +03:00
Fu Wei
f6061b489f
Merge pull request #5566 from dmcgowan/cleanup-diff-walking
Revert diff/walking error change
2021-06-06 09:41:03 +08:00
Phil Estes
fd2ca8dc6b
Merge pull request #5562 from dims/update-opencontainers/selinux-to-v1.8.2
Update opencontainers/selinux to v1.8.2
2021-06-04 15:01:13 -04:00
Derek McGowan
69f43d4589
Revert diff/walking error change
Clarify error scope and create variable for deferring cleanup

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-06-04 08:44:24 -07:00
Quan Tian
728743eb28 Fix cleanup context of teardownPodNetwork
Similar to other deferred cleanup operations, teardownPodNetwork should
use a different context as the original context may have expired,
otherwise CNI wouldn't been invoked, leading to leak of network
resources, e.g. IP addresses.

Signed-off-by: Quan Tian <qtian@vmware.com>
2021-06-04 19:17:05 +08:00
Fu Wei
e2f784269d
Merge pull request #5565 from mikebrow/wrapf-fixes
fix invalid validation error checking
2021-06-04 11:23:08 +08:00
Mike Brown
014748bc04 fix invalid validation error checking
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2021-06-03 15:58:11 -05:00
Michael Crosby
6ae90906ab
Merge pull request #5551 from Iceber/fix-diff
diff/walking: fix defer cleanup
2021-06-03 13:13:11 -04:00
Phil Estes
e3521ed14b
Merge pull request #5559 from adelina-t/win_rg_creation_timestamp
Windows periodic job: Add creation timestamp to RG
2021-06-03 12:44:59 -04:00
Claudiu Belu
cabe677369 tests: Use EnsureImageExists for image pulling
A previous commit introduced EnsureImageExists, which ensures that a particular image
already exists. It also deduplicates the image pulling code. Some tests missed this
update.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
2021-06-03 16:02:42 +00:00
Claudiu Belu
a78bdf22df tests: Refactors PodSandbox creation
Most of the tests creating and using Pod Sandboxes in the same way. We can create
a common function that will do that for us, so we can have less duplicated code,
and make it easier to add new tests in the future.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
2021-06-03 16:02:38 +00:00
Michael Crosby
ada96ec192
Merge pull request #5328 from kevpar/win-ci-cleanup
Fix error case in Windows layer cleanup
2021-06-03 11:15:39 -04:00
Michael Crosby
bd4fcf6322
Merge pull request #5422 from TBBle/use-layer-deactivate-instead-of-vhd-detach
Use DeactivateLayer to unlock layers that we cannot rename
2021-06-03 11:14:11 -04:00
Michael Crosby
265b3947a3
Merge pull request #5284 from claudiubelu/test-symlinks
tests: Symlink volume tests
2021-06-03 11:02:02 -04:00
Phil Estes
6dcd883299
Merge pull request #5535 from oss-qm/submit/makefile-destdir
Makefile: fix DESTDIR environment variable behaviour
2021-06-03 10:59:34 -04:00
Davanum Srinivas
9a451d103c
Update opencontainers/selinux to v1.8.2
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-06-03 10:35:11 -04:00
Claudiu Belu
93e268f625 tests: Symlink volume tests
There was a known issue regarding how the symlink files mounted as
volumes were being handled on Windows. This commit adds tests that
will check against those issue to ensure there won't be any
regressions.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
2021-06-03 13:26:22 +00:00
Akihiro Suda
308c7b34e8
Merge pull request #5560 from estesp/no-error
Change Wrapf of non-error to an actual error
2021-06-03 14:34:58 +09:00
Phil Estes
edfd8d5993
Change Wrapf of non-error to an actual error
Signed-off-by: Phil Estes <estesp@amazon.com>
2021-06-02 14:48:49 -04:00
Davanum Srinivas
a93b5cbc2f Install apparmor parser for arm64 environment
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
2021-06-02 12:43:32 -04:00
Adelina Tuvenie
5f0fc4893d Add creation timestamp to RG
Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
2021-06-02 13:16:40 +03:00
Akihiro Suda
686d3f262d
Merge pull request #5536 from zouyee/merge 2021-06-02 09:32:23 +09:00
Phil Estes
add4be6eec
Merge pull request #5554 from kzys/prometheus-doc
docs: explicitly mention containerd's Prometheus path
2021-06-01 18:38:14 -04:00
Phil Estes
954ef2b273
Merge pull request #5553 from claudiubelu/integration-test-cleanup-windows
integration: Cleanup containerd on test teardown
2021-06-01 14:41:37 -04:00
Kazuyoshi Kato
75daf45beb docs: explicitly mention containerd's Prometheus path
It is under `/v1/metrics`, which should be explicitly called out.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
2021-06-01 11:15:06 -07:00
Mike Brown
ffeea14aee
Merge pull request #5548 from Iceber/update-cri-link
docs/cri: update links
2021-06-01 10:36:37 -05:00
Claudiu Belu
2f870aa896 integration: Cleanup containerd on test teardown
On Windows, we were only killing the keepalive process, and the
containerd process would keep running.

keepalive and containerd have the same PGID, so we can use that information
to kill both of them.

Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
2021-06-01 15:22:43 +00:00
Iceber Gu
558fdc6808 diff/walking: fix defer cleanup
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
2021-06-01 18:24:47 +08:00