github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
9,309 Commits 3 Branches 2 Tags 112 MiB
7d77b51b49
Commit Graph

9309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Enrico Weigelt, metux IT consult
b5f530a157 Makefile: fix DESTDIR environment variable behaviour 
The DESTDIR environment variable is used in the wrong way: since 30+ years
it's common practise using it for specifying *temporary* target *root*
(where eg. packaging infrastructure picks up the install image), instead
of the installation *prefix* on the final target.

Fixing this by introducing PREFIX variable (with default /usr/local) and
using both variables according to the 30 years matured common practise.
That way, distro packagers and other standardized build/installation
systems can easily do correct deployments w/o individual hacks.

changes v2: removed variables not used yet
            added documentation

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
 2021-06-01 10:49:25 +02:00
zounengren
498bb36f67 scrub the stale TODO 
Signed-off-by: zounengren <zouyee1989@gmail.com>
 2021-06-01 11:22:15 +08:00
Iceber Gu
93d4541a20 docs/cri: update ocicrypt link 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2021-05-31 15:32:30 +08:00
Iceber Gu
7924664951 docs/cri: fix broken links 
Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
 2021-05-31 15:31:51 +08:00
Fu Wei
c8b33ba297
Merge pull request #5544 from dmcgowan/update-windows-periodic-tests 
Update Windows periodic tests
 2021-05-30 11:41:42 +08:00
Derek McGowan
05c03de94d
Update Windows periodic tests 
Allow these tests to be manually triggered as well

Signed-off-by: Derek McGowan <derek@mcg.dev>
 2021-05-28 10:37:25 -07:00
Derek McGowan
334e74765e
Merge pull request #5165 from adelina-t/azure_ci_workflow 
Add CI periodic Windows Jobs.
 2021-05-28 08:12:25 -07:00
Fu Wei
c8cbf7998b
Merge pull request #5273 from wzshiming/fix/local-store-atomic-write 
Rename atomicWrite to writeToCompletion
 2021-05-27 22:36:09 +08:00
Shiming Zhang
9fcea1d3f0 Rename atomicWrite to writeToCompletion 
Signed-off-by: Shiming Zhang <wzshiming@foxmail.com>
 2021-05-27 18:07:45 +08:00
Derek McGowan
925ff5a21b
Merge pull request #5539 from alakesh/btrfs-test 
Do not run btrfs tests if btrfs kernel module is not loaded
 2021-05-26 20:30:31 -07:00
Alakesh Haloi
b996e49c5c Do not run btrfs tests if btrfs kernel module is not loaded 
Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
 2021-05-26 13:45:56 -07:00
Derek McGowan
f0d2f89437
Merge pull request #5533 from povsister/fix-auth-ua 
Fix incorrect UA used for registry authentication
 2021-05-26 08:39:25 -07:00
Ethan Chen
50ad4b96c4 Fix incorrect UA used for registry authentication 
Previously, containerd uses Go's default UA "Go-http-client/1.1" while authenticating with registry.
This commit changes it to the pattern like "containerd/v1.5.2" which is used for all other requests.

Signed-off-by: Ethan Chen <pov@mahou-shoujo.moe>
 2021-05-26 09:45:54 +08:00
Derek McGowan
96df20cf77
Merge pull request #5531 from samuelkarp/freebsd-ctr-run-mounts 
ctr: parse mount options with embedded = character
 2021-05-25 13:38:54 -07:00
Phil Estes
ba4fa32dca
Merge pull request #5472 from gizahNL/freebsd_mounts 
Fix mounts for FreeBSD
 2021-05-25 14:11:37 -04:00
Phil Estes
0a92694e0a
Merge pull request #5527 from samuelkarp/freebsd-ctr-exec 
ctr: make exec pty behavior consistent with run
 2021-05-25 13:24:10 -04:00
Derek McGowan
c0794c06a2
Merge pull request #5534 from oss-qm/submit/makefile-at 
Makefile: use $@ for target file names
 2021-05-25 10:00:36 -07:00
Enrico Weigelt, metux IT consult
923ab5b7ca Makefile: use $@ for target file names 
Make rules can be formulated more generic by using the $@ symbol, instead
of duplicating the target file name.

Just a little cleanup for better maintainability.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
 2021-05-25 16:09:23 +02:00
Samuel Karp
535d9cc59f
ctr: parse mount options with embedded = character 
FreeBSD mount options may have embedded = characters.  For example,
devfs(5) supports the `ruleset` option which can be passed as
`ruleset=4` to indicate that ruleset 4 should be used.

Signed-off-by: Samuel Karp <me@samuelkarp.com>
 2021-05-25 00:21:37 -07:00
Gijs Peskens
a4f97d45da Add ruleset=4 option 
Signed-off-by: Gijs Peskens <gijs@peskens.net>
 2021-05-25 09:17:16 +02:00
Samuel Karp
5dec27b6f1
ctr: exec handle pty resize after Start 
Handle initial pty resize after the exec process has started and the pty
is available, consistent with the behavior of ctr run.

Signed-off-by: Samuel Karp <me@samuelkarp.com>
 2021-05-25 00:12:21 -07:00
Derek McGowan
531908c73d
Merge pull request #5528 from MaXinjian/0524 
Fix small typo
 2021-05-24 09:19:55 -07:00