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

9560 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Phil Estes
f43f22966d
Merge pull request #5902 from dweomer/rke2-690-on-main 
cri: filter selinux xattr for image volumes
 2021-08-23 09:48:10 -04:00
Jacob Blain Christen
c3609ff4ca cri: filter selinux xattr for image volumes 
Exclude the `security.selinux` xattr when copying content from layer
storage for image volumes. This allows for the already correct label
at the target location to be applied to the copied content, thus
enabling containers to write to volumes that they implicitly expect to be
able to write to.

- Fixes containerd/containerd#5090
- See rancher/rke2#690

Signed-off-by: Jacob Blain Christen <jacob@rancher.com>
 2021-08-20 23:47:24 -07:00
Phil Estes
ff2e58d114
Merge pull request #5131 from perithompson/windows-hostnetwork 
Add Windows HostProcess Support
 2021-08-20 14:29:37 -04:00
Phil Estes
736222dd87
Merge pull request #5897 from kzys/upgrade-golangci-lint 
script: update golangci-lint from v1.38.0 and v1.36.0 to v1.42.0
 2021-08-20 11:59:28 -04:00
Phil Estes
70d122b290
Merge pull request #5889 from estesp/update-go-1.17 
Update to Go 1.17
 2021-08-20 10:57:36 -04:00
Akihiro Suda
a6034d021f
Merge pull request #5896 from kzys/pid-order 
integration: fix TestContainerPids
 2021-08-20 13:36:26 +09:00
Kazuyoshi Kato
4dd5ca70fb script: update golangci-lint from v1.38.0 and v1.36.0 to v1.42.0 
golint has been deprecated and replaced by revive since v1.41.0.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-08-19 16:27:16 -07:00
Kazuyoshi Kato
acb81bbdaf integration: fix TestContainerPids 
task.Pids returns the task's processes, but the order is not guaranteed.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-08-19 09:56:22 -07:00
Phil Estes
9fe7bc938b
Bump integration timeout to 35 min 
Go 1.17 go mod download step (used to handle the separate integration
go.mod) seems to do a lot more work/validation than prior Go releases,
requiring more time for integration runs.

Signed-off-by: Phil Estes <estesp@amazon.com>
 2021-08-19 10:18:17 -04:00
Fu Wei
a5eccab278
Merge pull request #5891 from crosbymichael/net-host-env 
[ctr] add HOSTNAME env for host network
 2021-08-19 00:04:37 +08:00
Michael Crosby
6f60b3016f [ctr] add HOSTNAME env for host network 
Set the hostname environment var when using host networking via ctr

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2021-08-18 14:42:36 +00:00
Derek McGowan
fda782a7b9
Merge pull request #5886 from AdamKorcz/fuzz11 
Fuzzing: Add fuzzer
 2021-08-17 09:41:50 -07:00
Derek McGowan
c076ede405
Merge pull request #5884 from adisky/add-systemd-env 
Make Cgroup driver configurable in gce configure script
 2021-08-17 09:40:05 -07:00
Phil Estes
f8602c3725
Update to Go 1.17 
Signed-off-by: Phil Estes <estesp@amazon.com>
 2021-08-17 12:27:39 -04:00
AdamKorcz
c9b1b2fd5b Fuzzing: Add fuzzer 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2021-08-17 00:08:59 +01:00
Aditi Sharma
9e1b57ca01 Add env for SystemdCgroup driver 
Signed-off-by: Aditi Sharma <adi.sky17@gmail.com>
 2021-08-16 17:27:55 +05:30
Phil Estes
024804b1be
Merge pull request #5878 from gjkim42/allow-expanded-dns-config 
Allow expanded DNS configuration
 2021-08-13 21:22:35 -04:00
Gunju Kim
1224060f89 Allow expanded DNS configuration 
Signed-off-by: Gunju Kim <gjkim042@gmail.com>
 2021-08-14 06:13:01 +09:00
Derek McGowan
d0be7b90f1
Merge pull request #5863 from AdamKorcz/fuzz10 
Fuzzing: Add 4 fuzzers
 2021-08-12 09:08:25 -07:00
AdamKorcz
538d93d2fc Fuzzing: Add 4 fuzzers 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2021-08-12 15:34:12 +01:00
Peri Thompson
79b369a0bb
Added windows hostProcess cni skip 
Signed-off-by: Peri Thompson <perit@vmware.com>
 2021-08-11 22:23:49 +01:00
Phil Estes
7d4c95ff04
Merge pull request #5813 from mxpv/shim_cleanup 
Cleanup v2 shim
 2021-08-11 11:47:47 -04:00
Phil Estes
159c0f04e5
Merge pull request #5840 from AdamKorcz/fuzz9 
Fuzzing: Add experimental version of container fuzzer
 2021-08-11 11:45:49 -04:00
Fu Wei
1c4e9d0487
Merge pull request #5846 from crosbymichael/ctr-cpu.shares 2021-08-11 09:24:00 +08:00
Derek McGowan
0fbcf9b97f
Merge pull request #5847 from kzys/master-to-main 
docs: rename main to master
 2021-08-10 15:06:06 -07:00
Derek McGowan
4c7338aa64
Merge pull request #5849 from kzys/lock-error-2 
content: return the error with its timestamp
 2021-08-10 14:39:07 -07:00
Derek McGowan
0ae2d3987b
Merge pull request #5857 from dims/fix-bad-make-protos-failure 
Fix bad `make protos` failure
 2021-08-10 14:32:38 -07:00
Davanum Srinivas
82fe0db9aa
Fix bad make protos failure 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
 2021-08-10 16:03:54 -04:00
Mike Brown
ed564061e5
Merge pull request #5851 from zouyee/location 
replace cri and point to new location
 2021-08-10 13:04:01 -05:00
Maksym Pavlenko
56c5daa52d
Merge pull request #5856 from kzys/remove-fossa 
docs: remove FOSSA's badge
 2021-08-10 10:53:57 -07:00
Phil Estes
37f2c7ca8d
Merge pull request #5850 from thaJeztah/runc_build_docs 
BUILDING.md: remove some bits about building runc
 2021-08-10 13:09:08 -04:00
Kevin Parsons
284c29dde7
Merge pull request #5836 from dcantah/k8s122 
go.mod: update k8s deps to v1.22.0
 2021-08-10 09:53:49 -07:00
Kazuyoshi Kato
1c47fb17f3 docs: remove FOSSA's badge 
The automated scan doesn't work correctly and it would give
contributors a doubt regarding containerd's license.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-08-10 09:48:01 -07:00
Kazuyoshi Kato
bc4cea4e44 docs: rename main to master 
containerd and opencontainers/image-spec have renamed its main branch
from "master" to "main"

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-08-10 09:42:16 -07:00
Fu Wei
9d07f8d9a4
Merge pull request #5852 from adelina-t/add_trap_cri_integration_script 2021-08-10 21:14:42 +08:00
AdamKorcz
5e49ec27dc Use http.Get to download binaries instead of exec.Command 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2021-08-10 12:48:33 +01:00
Adelina Tuvenie
e6538b8bce Add trap to cri-integration test script 
The cri-integration.sh script sets errexit option. This does not
work properly on Bash in Windows, espectially when the script is
piped to something else ( tee in this case ). In this particular
case, the problem arises from the fact that if the script exits
prematurely, it will not get a chance to call test_teardown and
thus clean the remaining containerd process, thus the whole
command will hang indefinetly.

Adding a simple trap on EXIT to call test_teardown will easily
fix this.

Signed-off-by: Adelina Tuvenie <atuvenie@cloudbasesolutions.com>
 2021-08-10 13:37:05 +03:00
Michael Crosby
d2f3b71468 add cpu-shares to ctr 
This allows the cpu shares to be modified via ctr.

Signed-off-by: Michael Crosby <michael@thepasture.io>
 2021-08-10 04:12:15 -04:00
zounengren
30b832e494 archive docs and point to new location 
fix #https://github.com/containerd/cri/issues/1624

Signed-off-by: Zou Nengren <zouyee1989@gmail.com>
 2021-08-10 15:54:06 +08:00
Sebastiaan van Stijn
9cc179aa77
BUILDING.md: remove some bits about building runc 
Refer users to runc's documentation instead of duplicating
the instructions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-08-10 09:31:02 +02:00
Sebastiaan van Stijn
42b57cc730
BUILDING.md: markdown fixes 
- correct language-hints on code-fences
- fix duplicate titles, causing non-unique anchors

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-08-10 09:27:50 +02:00
Fu Wei
0bcd45d3a0
Merge pull request #5848 from kzys/build-flags 2021-08-10 12:23:30 +08:00
Kazuyoshi Kato
a3d6edc0ed content: return the error with its timestamp 
The current timestamp is probably included in production logs, but
won't be in testing environments such as GitHub Actions.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-08-09 16:52:40 -07:00
Kazuyoshi Kato
a5468852f8 docs: list all snapshotter-related build flags 
We can disable most of snapshotters, but they are not documented.

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
 2021-08-09 16:33:06 -07:00
Daniel Canter
e634f04d8c go.mod: update kubernetes to v1.22.0 
This brings in some cri api changes for cgroups, Windows pod sandbox security
context changes and some new fields for the Windows version of a privileged
container.

This also unfortunately bumps the prometheus client, grpc middleware, bolt
and klog :(

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
 2021-08-09 16:16:54 -04:00
AdamKorcz
11a90c7ff4 Fuzzing: Add experimental version of container fuzzer 
Signed-off-by: AdamKorcz <adam@adalogics.com>
 2021-08-09 11:18:25 +01:00
Michael Crosby
218db0f9af
Merge pull request #5835 from dmcgowan/plugin-events-cleanup 
Move plugin context events into separate plugin
 2021-08-07 21:47:11 -04:00
Michael Crosby
7f0be5edd8
Merge pull request #5839 from dcantah/ci-weirdness 
Fix Linux CI Linter using Go 1.15.14
 2021-08-07 21:43:56 -04:00
Michael Crosby
1373bc519b
Merge pull request #5842 from thaJeztah/update_go_116 
Update Go to 1.16.7
 2021-08-07 21:42:53 -04:00
Sebastiaan van Stijn
42a28ad2ca
Update Go to 1.16.7 
go1.16.7 (released 2021-08-05) includes a security fix to the net/http/httputil
package, as well as bug fixes to the compiler, the linker, the runtime, the go
command, and the net/http package. See the Go 1.16.7 milestone on the issue
tracker for details:

https://github.com/golang/go/issues?q=milestone%3AGo1.16.7+label%3ACherryPickApproved

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2021-08-07 18:07:50 +02:00