Phil Estes
569a8d6b60
Merge pull request #10626 from dmcgowan/content-local-plugin
...
Register local content plugin from separate package
2024-08-26 19:11:57 +00:00
Maksym Pavlenko
dc8f875b03
Merge pull request #10631 from containerd/dependabot/go_modules/github.com/prometheus/client_golang-1.20.1
...
build(deps): bump github.com/prometheus/client_golang from 1.19.1 to 1.20.1
2024-08-26 16:37:12 +00:00
Phil Estes
2b6b961dfa
Merge pull request #10635 from djdongjin/remove-sha256-simd
...
Remove sha256-simd dependency
2024-08-26 15:18:46 +00:00
Phil Estes
f97b02fb31
Merge pull request #10614 from containerd/dependabot/github_actions/google-github-actions/upload-cloud-storage-2.1.3
...
build(deps): bump google-github-actions/upload-cloud-storage from 2.1.2 to 2.1.3
2024-08-26 15:17:10 +00:00
Wei Fu
3cd8f9734d
core/mount: use ptrace instead of go:linkname
...
The Go runtime has started to [lock down future uses of linkname][1] since
go1.23. In the go source code, containerd project has been marked in the
comment, [hall of shame][2]. Well, the go:linkname is used to fork no-op
subprocess efficiently. However, since that comment, I would like to use
ptrace and remove go:linkname in the whole repository.
With go1.22 `go:linkname`:
```bash
$ go test -bench=. -benchmem ./ -exec sudo
goos: linux
goarch: amd64
pkg: github.com/containerd/containerd/v2/core/mount
cpu: AMD Ryzen 7 5800H with Radeon Graphics
BenchmarkBatchRunGetUsernsFD_Concurrent1-16 2440 533320 ns/op 1145 B/op 43 allocs/op
BenchmarkBatchRunGetUsernsFD_Concurrent10-16 342 3661616 ns/op 11562 B/op 421 allocs/op
PASS
ok github.com/containerd/containerd/v2/core/mount 2.983s
```
With go1.22 `ptrace`:
```bash
$ go test -bench=. -benchmem ./ -exec sudo
goos: linux
goarch: amd64
pkg: github.com/containerd/containerd/v2/core/mount
cpu: AMD Ryzen 7 5800H with Radeon Graphics
BenchmarkBatchRunGetUsernsFD_Concurrent1-16 1785 739557 ns/op 3948 B/op 68 allocs/op
BenchmarkBatchRunGetUsernsFD_Concurrent10-16 328 4024300 ns/op 39601 B/op 671 allocs/op
PASS
ok github.com/containerd/containerd/v2/core/mount 3.104s
```
With go1.23 `ptrace`:
```bash
$ go test -bench=. -benchmem ./ -exec sudo
goos: linux
goarch: amd64
pkg: github.com/containerd/containerd/v2/core/mount
cpu: AMD Ryzen 7 5800H with Radeon Graphics
BenchmarkBatchRunGetUsernsFD_Concurrent1-16 1815 723252 ns/op 4220 B/op 69 allocs/op
BenchmarkBatchRunGetUsernsFD_Concurrent10-16 319 3957157 ns/op 42351 B/op 682 allocs/op
PASS
ok github.com/containerd/containerd/v2/core/mount 3.051s
```
Diff:
The `ptrace` is slower than `go:linkname` mode. However, it's accepctable.
```
goos: linux
goarch: amd64
pkg: github.com/containerd/containerd/v2/core/mount
cpu: AMD Ryzen 7 5800H with Radeon Graphics
│ go122-golinkname │ go122-ptrace │ go123-ptrace │
│ sec/op │ sec/op vs base │ sec/op vs base │
BatchRunGetUsernsFD_Concurrent1-16 533.3µ ± ∞ ¹ 739.6µ ± ∞ ¹ ~ (p=1.000 n=1) ² 723.3µ ± ∞ ¹ ~ (p=1.000 n=1) ²
BatchRunGetUsernsFD_Concurrent10-16 3.662m ± ∞ ¹ 4.024m ± ∞ ¹ ~ (p=1.000 n=1) ² 3.957m ± ∞ ¹ ~ (p=1.000 n=1) ²
geomean 1.397m 1.725m +23.45% 1.692m +21.06%
¹ need >= 6 samples for confidence interval at level 0.95
² need >= 4 samples to detect a difference at alpha level 0.05
│ go122-golinkname │ go122-ptrace │ go123-ptrace │
│ B/op │ B/op vs base │ B/op vs base │
BatchRunGetUsernsFD_Concurrent1-16 1.118Ki ± ∞ ¹ 3.855Ki ± ∞ ¹ ~ (p=1.000 n=1) ² 4.121Ki ± ∞ ¹ ~ (p=1.000 n=1) ²
BatchRunGetUsernsFD_Concurrent10-16 11.29Ki ± ∞ ¹ 38.67Ki ± ∞ ¹ ~ (p=1.000 n=1) ² 41.36Ki ± ∞ ¹ ~ (p=1.000 n=1) ²
geomean 3.553Ki 12.21Ki +243.65% 13.06Ki +267.43%
¹ need >= 6 samples for confidence interval at level 0.95
² need >= 4 samples to detect a difference at alpha level 0.05
│ go122-golinkname │ go122-ptrace │ go123-ptrace │
│ allocs/op │ allocs/op vs base │ allocs/op vs base │
BatchRunGetUsernsFD_Concurrent1-16 43.00 ± ∞ ¹ 68.00 ± ∞ ¹ ~ (p=1.000 n=1) ² 69.00 ± ∞ ¹ ~ (p=1.000 n=1) ²
BatchRunGetUsernsFD_Concurrent10-16 421.0 ± ∞ ¹ 671.0 ± ∞ ¹ ~ (p=1.000 n=1) ² 682.0 ± ∞ ¹ ~ (p=1.000 n=1) ²
geomean 134.5 213.6 +58.76% 216.9 +61.23%
¹ need >= 6 samples for confidence interval at level 0.95
² need >= 4 samples to detect a difference at alpha level 0.05
```
[1]: <https://github.com/golang/go/issues/67401 >
[2]: <https://github.com/golang/go/blob/release-branch.go1.23/src/runtime/proc.go#L4820 >
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-08-26 21:19:50 +08:00
Jin Dong
35b0292572
remove sha256-simd
...
Signed-off-by: Jin Dong <djdongjin95@gmail.com>
2024-08-25 04:46:04 +00:00
dependabot[bot]
1195b68eb2
build(deps): bump github.com/prometheus/client_golang
...
Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang ) from 1.19.1 to 1.20.1.
- [Release notes](https://github.com/prometheus/client_golang/releases )
- [Changelog](https://github.com/prometheus/client_golang/blob/v1.20.1/CHANGELOG.md )
- [Commits](https://github.com/prometheus/client_golang/compare/v1.19.1...v1.20.1 )
---
updated-dependencies:
- dependency-name: github.com/prometheus/client_golang
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-23 17:56:16 +00:00
Akihiro Suda
7b948faa08
Merge pull request #10618 from containerd/dependabot/go_modules/k8s-f6dd80a502
...
build(deps): bump the k8s group with 5 updates
2024-08-23 17:19:48 +00:00
Derek McGowan
50b06182f8
Register local content plugin from separate package
...
Update the local content plugin to register itself in a consistent way
as other plugins. This also allows the separate package to define its
own configuration more cleanly.
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-08-22 11:18:30 -07:00
dependabot[bot]
021063c4ab
build(deps): bump the k8s group with 5 updates
...
Bumps the k8s group with 5 updates:
| Package | From | To |
| --- | --- | --- |
| [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery ) | `0.30.3` | `0.31.0` |
| [k8s.io/client-go](https://github.com/kubernetes/client-go ) | `0.30.3` | `0.31.0` |
| [k8s.io/component-base](https://github.com/kubernetes/component-base ) | `0.30.3` | `0.31.0` |
| [k8s.io/kubelet](https://github.com/kubernetes/kubelet ) | `0.30.3` | `0.31.0` |
| [k8s.io/utils](https://github.com/kubernetes/utils ) | `0.0.0-20230726121419-3b25d923346b` | `0.0.0-20240711033017-18e509b52bc8` |
Updates `k8s.io/apimachinery` from 0.30.3 to 0.31.0
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.30.3...v0.31.0 )
Updates `k8s.io/client-go` from 0.30.3 to 0.31.0
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md )
- [Commits](https://github.com/kubernetes/client-go/compare/v0.30.3...v0.31.0 )
Updates `k8s.io/component-base` from 0.30.3 to 0.31.0
- [Commits](https://github.com/kubernetes/component-base/compare/v0.30.3...v0.31.0 )
Updates `k8s.io/kubelet` from 0.30.3 to 0.31.0
- [Commits](https://github.com/kubernetes/kubelet/compare/v0.30.3...v0.31.0 )
Updates `k8s.io/utils` from 0.0.0-20230726121419-3b25d923346b to 0.0.0-20240711033017-18e509b52bc8
- [Commits](https://github.com/kubernetes/utils/commits )
---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: k8s
- dependency-name: k8s.io/client-go
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: k8s
- dependency-name: k8s.io/component-base
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: k8s
- dependency-name: k8s.io/kubelet
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: k8s
- dependency-name: k8s.io/utils
dependency-type: direct:production
update-type: version-update:semver-patch
dependency-group: k8s
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-20 00:46:42 +00:00
Fu Wei
e8104a4858
Merge pull request #10613 from kiashok/update-hcsshim-12.6
...
Update hcsshim to v0.12.6
2024-08-20 00:07:27 +00:00
dependabot[bot]
1bff3bfeda
build(deps): bump dario.cat/mergo from 1.0.0 to 1.0.1
...
Bumps [dario.cat/mergo](https://github.com/imdario/mergo ) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/imdario/mergo/releases )
- [Commits](https://github.com/imdario/mergo/compare/v1.0.0...v1.0.1 )
---
updated-dependencies:
- dependency-name: dario.cat/mergo
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-19 23:51:42 +00:00
dependabot[bot]
429085c84d
build(deps): bump google-github-actions/upload-cloud-storage
...
Bumps [google-github-actions/upload-cloud-storage](https://github.com/google-github-actions/upload-cloud-storage ) from 2.1.2 to 2.1.3.
- [Release notes](https://github.com/google-github-actions/upload-cloud-storage/releases )
- [Changelog](https://github.com/google-github-actions/upload-cloud-storage/blob/main/CHANGELOG.md )
- [Commits](https://github.com/google-github-actions/upload-cloud-storage/compare/v2.1.2...v2.1.3 )
---
updated-dependencies:
- dependency-name: google-github-actions/upload-cloud-storage
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-19 23:20:08 +00:00
Kirtana Ashok
93abc2fdda
Update hcsshim to v0.12.6
...
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2024-08-19 15:30:51 -07:00
Wei Fu
bcdf507363
core/mount: add benchmark test for GetUsernsFD
...
```bash
$ go test -bench=. -benchmem ./ -exec sudo
goos: linux
goarch: amd64
pkg: github.com/containerd/containerd/v2/core/mount
cpu: AMD Ryzen 7 5800H with Radeon Graphics
BenchmarkBatchRunGetUsernsFD_Concurrent1-16 2398 532424 ns/op 1145 B/op 43 allocs/op
BenchmarkBatchRunGetUsernsFD_Concurrent10-16 343 3701695 ns/op 11552 B/op 421 allocs/op
PASS
ok github.com/containerd/containerd/v2/core/mount 2.978s
```
Signed-off-by: Wei Fu <fuweid89@gmail.com>
2024-08-19 19:11:25 +08:00
Phil Estes
0ecaec4dde
Merge pull request #10338 from harshitasao/scorecard-badge
...
Added the OpenSSF Scorecard Badge
2024-08-16 18:32:06 +00:00
Phil Estes
704c94b638
Merge pull request #10600 from akhilerm/update-support-matrix
...
docs: add k8s 1.31 to support matrix
2024-08-16 14:06:13 +00:00
Phil Estes
219df0e7a2
Merge pull request #10604 from thaJeztah/openssf_happiness
...
script/setup/install-dev-tools: update protoc-gen-go-ttrpc to v1.2.5, specify patch versions
2024-08-16 13:44:20 +00:00
Sebastiaan van Stijn
66817fccc3
script/setup/install-dev-tools: include patch version in versions
...
The OpenSSF scorecard is complaining about these two dependencies being
installed without a patch version specified;
Warn: goCommand not pinned by hash: script/setup/install-dev-tools:27
Warn: goCommand not pinned by hash: script/setup/install-dev-tools:28
While the error indicates it expects a hash, it looks like it's fine
with other modules in the same file, the difference being that those
specify a full version, including path version, e.g.;
919beb1cf7/script/setup/install-dev-tools (L26)
2024-08-16 10:54:17 +02:00
Sebastiaan van Stijn
cd4e24ef71
script/setup/install-dev-tools: update protoc-gen-go-ttrpc to v1.2.5
...
The current version was updated in 65031eadechttps://github.com/containerd/ttrpc/compare/v1.2.3...faba5896a9c4d7b65495cb9b2c02531feb1434d6
- slightly behind of v1.2.4; faba5896a9faba5896a9
2024-08-16 10:53:37 +02:00
Akhil Mohan
9e2357f338
docs: add k8s 1.31 to support matrix to RELEASES
...
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-08-16 11:50:03 +05:30
Akihiro Suda
919beb1cf7
Merge pull request #10593 from jjmaestro/patch-1
...
docs: Update BUILDING.md
2024-08-15 22:31:42 +00:00
Mike Brown
a9227860ee
Merge pull request #10526 from AkihiroSuda/fix-10132
...
docs: update for containerd v2
2024-08-15 21:53:56 +00:00
Akihiro Suda
a3d84a1727
docs: update for containerd v2
...
Fix issue 10132
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-08-16 03:09:50 +09:00
Javier Maestro
43568373f4
docs: Update BUILDING.md
...
Signed-off-by: Javier Maestro <jjmaestro@ieee.org>
2024-08-15 18:12:06 +01:00
Akihiro Suda
6f3833f258
CRI: remove disable_cgroup
...
`disable_cgroup` was implemenetd in containerd/cri PR 970 (Nov 2018)
for supporting very early version of Usernetes on cgroup v1 hosts,
when most distros were still not ready to support cgroup v2.
This configuration is no longer needed, as cgroup v2 delegation is
now supported on almost all distros.
Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-08-15 06:08:30 +09:00
Akihiro Suda
f5d5407c2f
Merge pull request #10578 from akhilerm/test-gotip
...
Add go 1.23.0
2024-08-14 19:50:59 +00:00
Akhil Mohan
ebc47359ea
use format string when using printf like commands
...
As per https://github.com/golang/go/issues/60529 , printf like commands with
non-constant format strings and no args give an error in govet
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-08-14 17:04:53 +05:30
Akhil Mohan
1027b314a6
ignore the static check when using anonymous struct in testing
...
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-08-14 14:50:39 +05:30
Akhil Mohan
f8e0753366
remove windows check in linux_test file
...
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-08-14 14:22:03 +05:30
Akhil Mohan
20ee6de0b5
update golangci-lint to v1.60.1
...
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-08-14 12:40:37 +05:30
Akhil Mohan
fb8cd045b8
add go1.23.0
...
Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-08-14 12:30:37 +05:30
Akihiro Suda
a406da9628
Merge pull request #10584 from containerd/dependabot/github_actions/google-github-actions/upload-cloud-storage-2.1.2
...
build(deps): bump google-github-actions/upload-cloud-storage from 2.1.1 to 2.1.2
2024-08-13 09:53:06 +00:00
Akihiro Suda
bd9aed6492
Merge pull request #10586 from containerd/dependabot/go_modules/github.com/urfave/cli/v2-2.27.4
...
build(deps): bump github.com/urfave/cli/v2 from 2.27.3 to 2.27.4
2024-08-13 07:24:37 +00:00
Akihiro Suda
c878093c5e
Merge pull request #10552 from containerd/dependabot/go_modules/k8s-cec78cdc0e
...
build(deps): bump k8s.io/cri-api from 0.31.0-beta.0.0.20240716205706-865479a3e1b3 to 0.32.0-alpha.0 in the k8s group
2024-08-13 05:55:34 +00:00
Akihiro Suda
eebc80df58
Merge pull request #10585 from containerd/dependabot/go_modules/golang-x-ef3ba730bc
...
build(deps): bump golang.org/x/sys from 0.23.0 to 0.24.0 in the golang-x group
2024-08-13 05:51:42 +00:00
Fu Wei
dd2a24cf0e
Merge pull request #10557 from tariq1890/cli-ctx-add
...
use ctx object from cliContext instead of a creating a new one
2024-08-13 01:13:48 +00:00
Fu Wei
7403f91f1a
Merge pull request #10560 from samuelkarp/ctr-shim-state
...
ctr: shim state for secondary tasks & shim state query for old shims
2024-08-13 01:13:30 +00:00
dependabot[bot]
3f53e7a6eb
build(deps): bump github.com/urfave/cli/v2 from 2.27.3 to 2.27.4
...
Bumps [github.com/urfave/cli/v2](https://github.com/urfave/cli ) from 2.27.3 to 2.27.4.
- [Release notes](https://github.com/urfave/cli/releases )
- [Changelog](https://github.com/urfave/cli/blob/main/docs/CHANGELOG.md )
- [Commits](https://github.com/urfave/cli/compare/v2.27.3...v2.27.4 )
---
updated-dependencies:
- dependency-name: github.com/urfave/cli/v2
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-12 23:39:07 +00:00
dependabot[bot]
1127908ae5
build(deps): bump k8s.io/cri-api in the k8s group
...
Bumps the k8s group with 1 update: [k8s.io/cri-api](https://github.com/kubernetes/cri-api ).
Updates `k8s.io/cri-api` from 0.31.0-beta.0.0.20240716205706-865479a3e1b3 to 0.32.0-alpha.0
- [Commits](https://github.com/kubernetes/cri-api/commits/v0.32.0-alpha.0 )
---
updated-dependencies:
- dependency-name: k8s.io/cri-api
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: k8s
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-12 23:38:55 +00:00
dependabot[bot]
6ed54e9663
build(deps): bump golang.org/x/sys in the golang-x group
...
Bumps the golang-x group with 1 update: [golang.org/x/sys](https://github.com/golang/sys ).
Updates `golang.org/x/sys` from 0.23.0 to 0.24.0
- [Commits](https://github.com/golang/sys/compare/v0.23.0...v0.24.0 )
---
updated-dependencies:
- dependency-name: golang.org/x/sys
dependency-type: direct:production
update-type: version-update:semver-minor
dependency-group: golang-x
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-12 23:38:55 +00:00
dependabot[bot]
1de84c29f1
build(deps): bump google-github-actions/upload-cloud-storage
...
Bumps [google-github-actions/upload-cloud-storage](https://github.com/google-github-actions/upload-cloud-storage ) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/google-github-actions/upload-cloud-storage/releases )
- [Changelog](https://github.com/google-github-actions/upload-cloud-storage/blob/main/CHANGELOG.md )
- [Commits](https://github.com/google-github-actions/upload-cloud-storage/compare/v2.1.1...v2.1.2 )
---
updated-dependencies:
- dependency-name: google-github-actions/upload-cloud-storage
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2024-08-12 23:07:43 +00:00
Kazuyoshi Kato
6b04c9dfac
Merge pull request #10550 from containerd/dependabot/github_actions/google-github-actions/upload-cloud-storage-2.1.1
...
build(deps): bump google-github-actions/upload-cloud-storage from 2.1.0 to 2.1.1
2024-08-09 23:08:42 +00:00
Maksym Pavlenko
3c344bc589
Merge pull request #10569 from thaJeztah/bump_go
...
update to go1.22.6
2024-08-09 18:25:19 +00:00
Maksym Pavlenko
0b02e0c225
Merge pull request #7616 from swagatbora90/trace-cri-runtime
...
Add tracing spans to CRI runtime service apis
2024-08-09 18:24:47 +00:00
Sebastiaan van Stijn
a100b055cb
update to go1.22.6
...
- https://github.com/golang/go/issues?q=milestone%3AGo1.22.6+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.22.5...go1.22.6
go1.22.6 (released 2024-08-06) includes fixes to the go command, the compiler,
the linker, the trace command, the covdata command, and the bytes, go/types,
and os/exec packages. See the Go 1.22.6 milestone on our issue tracker for
details.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-08-09 17:02:18 +02:00
Derek McGowan
268ae7fa02
Merge pull request #10562 from zhsj/pidfd
...
Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4
2024-08-09 13:13:58 +00:00
Derek McGowan
ee86aba275
Merge pull request #10563 from thaJeztah/migrate_userns
...
migrate to github.com/moby/sys/userns
2024-08-09 13:13:02 +00:00
Sebastiaan van Stijn
9776047243
migrate to github.com/moby/sys/userns
...
Commit 8437c567d8
2024-08-08 12:48:54 +02:00
Shengjing Zhu
8ef73c5dd5
Fix TestNewBinaryIOCleanup on Go 1.23 and Linux 5.4
...
When running the test on Ubuntu focal (kernel version 5.4), the
symlink for pidfd is anon_inode:[pidfd].
Updates: #10345
Signed-off-by: Shengjing Zhu <zhsj@debian.org>
2024-08-08 17:20:19 +08:00
