Commit Graph

10081 Commits

Author SHA1 Message Date
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
Fu Wei
fedd657ea0
Merge pull request #5838 from mxpv/ci
Cleanup CI
2021-08-07 11:33:14 +08:00
Daniel Canter
534685f955 Fix Linux CI Linter using go 1.15.14
For some reason the Linux CI runs end up using go 1.15.14 instead of 1.16.6 for
the Windows runs, or any of the other CI steps. Not sure if this is due to
the linter installing it's own version of go or something else.

Signed-off-by: Daniel Canter <dcanter@microsoft.com>
2021-08-06 16:22:42 -07:00
Maksym Pavlenko
10eab21a4d Cleanup CI
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-08-06 14:59:05 -07:00
Phil Estes
587fc09259
Merge pull request #5834 from dmcgowan/remove-redundant-build-tags
Remove redundant build tags
2021-08-06 10:03:49 -04:00
Derek McGowan
0a0621bb47
Move plugin context events into separate plugin
Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-08-05 22:59:20 -07:00
Derek McGowan
6f027e38a8
Remove redundant build tags
Remove build tags which are already implied by the name of the file.
Ensures build tags are used consistently

Signed-off-by: Derek McGowan <derek@mcg.dev>
2021-08-05 22:27:46 -07:00
Derek McGowan
b43d9502c2
Merge pull request #5830 from mxpv/darwin
Change default directories on Darwin
2021-08-05 21:47:00 -07:00
Phil Estes
5b76d08f4c
Merge pull request #5731 from alakesh/opentelemetry-basic
[otel-tracing] Initial opentelemetry support
2021-08-05 21:58:14 -04:00
Alakesh Haloi
3c5424454b [otel-tracing] vendor and go modules changes
This tracks all the vendor file changes and changes to go modules due
to OpenTelemetry support

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
2021-08-04 14:25:12 -07:00
Alakesh Haloi
3597ac859d [otel-tracing] Initial opentelemetry support
Add basic intiialization of opentelemetry including minimum support to
be able to read open telemetry config from config.toml and initialize
exporter. Tracer is initialized and ready to be be used for creating
spans, sub spans etc. With no opentelemetry configuration enabled in
config file, this patch is a no-op.

Basic config stub to be added to use opentelemetry is to add following
in config.toml. We use otlp exporter with default port 4317.

[otel]
  exporter_name = "otlp"
  exporter_endpoint = "0.0.0.1:4317"

otel-collector binary needs to run listening at the same port.

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
2021-08-04 14:25:01 -07:00
Maksym Pavlenko
7917da764c Change default directories on Darwin
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-08-04 14:12:32 -07:00
Alakesh Haloi
10824eaf2e remove go 1.13 from containerd
We no longer would need go 1.13.x for moby/containerd compatibility with
containerd moving to 1.16.x

Signed-off-by: Alakesh Haloi <alakeshh@amazon.com>
2021-08-04 11:58:53 -07:00
Maksym Pavlenko
d30d897ef9 Cleanup v2 shim
Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
2021-08-04 10:38:05 -07:00
Fu Wei
b97a56b714
Merge pull request #5829 from AdamKorcz/fuzz8
Fuzzing: Fix for OSS-fuzz issue 36825
2021-08-04 22:55:34 +08:00
AdamKorcz
c3c276ae1c Fuzzing: Fix for OSS-fuzz issue 36825
Signed-off-by: AdamKorcz <adam@adalogics.com>
2021-08-04 12:50:36 +01:00
Phil Estes
dd08c7a49f
Merge pull request #5825 from AdamKorcz/fuzz7
Fuzzing: Add two fuzzers
2021-08-03 15:53:50 -04:00
Derek McGowan
424d7e47bc
Merge pull request #5760 from thaJeztah/cleanup_test_scripts
scripts: linting fixes, and remove support for Debian Jessie (as it's EOL)
2021-08-03 09:48:20 -07:00
Sebastiaan van Stijn
6c257552a7
scripts: declare ROOT closer to where it's used, and some DRY changes
This also prevents shellcheck from complaining about a possibly
undefined variable.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-03 17:27:03 +02:00
Sebastiaan van Stijn
dba0ef4eb5
scripts: add missing quotes, and minor linting issues
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-03 17:23:18 +02:00
Sebastiaan van Stijn
0cb656860f
test/build-utils.sh: remove support for Debian Jessie
Jessie is EOL since June 30, 2020, so it's probably fine to assume it's
no longer used.

https://www.debian.org/News/2020/20200709

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-03 17:05:24 +02:00
AdamKorcz
41a04246f4 Fuzzing: Add two more fuzzers
Signed-off-by: AdamKorcz <adam@adalogics.com>
2021-08-03 12:23:38 +01:00
Maksym Pavlenko
7d4891783a
Merge pull request #5821 from thaJeztah/simplify_platforms_format
platforms: Format(): use path.Join() instead of joinNotEmpty()
2021-08-02 10:22:29 -07:00
Phil Estes
58dbe9685e
Merge pull request #5823 from AdamKorcz/fuzz6
Fuzzing: Remove panics of container_fuzzer
2021-08-02 10:39:34 -04:00
AdamKorcz
2c699cc350 Fuzzing: Remove panics of container_fuzzer
Signed-off-by: AdamKorcz <adam@adalogics.com>
2021-08-02 11:28:05 +01:00
Sebastiaan van Stijn
f2c3122e9c
platforms: Format(): use path.Join() instead of joinNotEmpty()
path.Join() also skips empty components, making it the equivalent of
this function.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2021-08-02 09:48:34 +02:00
Derek McGowan
f12040b6b6
Merge pull request #5785 from AdamKorcz/fuzz5
Fuzzing: Add container fuzzer
2021-07-30 09:44:09 -07:00
AdamKorcz
acecd66031 Change protoc link
Signed-off-by: AdamKorcz <adam@adalogics.com>
2021-07-30 10:06:47 +01:00
Maksym Pavlenko
fcd9c41991
Merge pull request #5746 from lifupan/main
runtime: fix the issue of create new socket with abstract address
2021-07-29 15:40:28 -07:00
Maksym Pavlenko
ee1dfc0cd9
Merge pull request #5809 from isugimpy/main
mergo: Upgrade to 0.3.12 to fix panic
2021-07-29 12:32:37 -07:00