github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity
14,496 Commits 3 Branches 2 Tags 112 MiB
30b929ece7
Commit Graph

14496 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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)

This patch updates `protoc-gen-go` and `protoc-gen-go-grpc` to the latest
patch release for the specified versions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 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 65031eadec,
and looks to be

- 1 commit ahead of v1.2.3; https://github.com/containerd/ttrpc/compare/v1.2.3...faba5896a9c4d7b65495cb9b2c02531feb1434d6
- slightly behind of v1.2.4; faba5896a9...v1.2.4

This patch upstreas it to the current (v1.2.5) version, aligning it with
the version used in `go.mod`;
faba5896a9...v1.2.5

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 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 migrated the use of the
userns package to the github.com/moby/sys/user module.

After further discussion with maintainers, it was decided to move the
userns package to a separate module, as it has no direct relation with
"user" operations (other than having "user" in its name).

This patch migrates our code to use the new module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 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
Samuel Karp
7d4da0cb28
ctr: shim state query for old shims 
Old shims do not implement containerd.task.v3.Task, but it can be
useful to use a new ctr with an older shim especially during upgrade
scenarios.

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2024-08-07 16:48:14 -07:00
Samuel Karp
d59e8a8404
ctr: shim state for secondary tasks 
The v2 shim interface supports grouping, so a single shim can manage
multiple tasks.  Prior to this change, the `shim state` command could
only query the state of the primary task (task that shares the same ID
as the shim).

Signed-off-by: Samuel Karp <samuelkarp@google.com>
 2024-08-07 16:48:08 -07:00
Samuel Karp
58cf6e2830
Merge pull request #10551 from containerd/dependabot/go_modules/golang-x-39bd39f2da 
build(deps): bump the golang-x group with 3 updates
 2024-08-07 06:01:35 +00:00
Tariq Ibrahim
32c2d14932
use ctx object from cliContext instead of a creating a new one 
Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
 2024-08-06 13:42:22 -07:00
Maksym Pavlenko
10d4ee9dc1
Merge pull request #10556 from thaJeztah/fix_runc_version 
script/setup/install-runc: fix runc using incorrect version
 2024-08-06 20:35:45 +00:00
Sebastiaan van Stijn
349d2b5c15
script/setup/install-runc: fix runc using incorrect version 
runc v1.1.13 introduced an option to customize the version (as printed by the
`--version` flag) through a `VERSION` Make variable / environment variable
(see [1]).

This variable collided with the `VERSION` environment variable used by
containerd for the same purpose, which lead to `runc` binaries built
using the version of containerd;

    runc --version
    runc version 1.7.20
    commit: v1.1.13-0-g58aa9203
    ...

This patch unsets the `VERSION` variable to bring prevent it from being
inherited and to bring back the previous behavior.

Before this patch:

    docker build -t containerd-test -f contrib/Dockerfile.test .
    docker run -it --rm --env VERSION=1.7.20 containerd-test sh -c 'script/setup/install-runc && /usr/local/sbin/runc --version'
    # ....
    HEAD is now at 58aa9203 VERSION: release 1.1.13
    go build -trimpath "-buildmode=pie"  -tags "seccomp" -ldflags "-X main.gitCommit=v1.1.13-0-g58aa9203 -X main.version=1.7.20 " -o runc .
    install -D -m0755 runc /usr/local/sbin/runc
    /go/src/github.com/containerd/containerd
    runc version 1.7.20
    commit: v1.1.13-0-g58aa9203
    spec: 1.0.2-dev
    go: go1.22.5
    libseccomp: 2.5.4

With this patch:

    docker build -t containerd-test -f contrib/Dockerfile.test .
    docker run -it --rm --env VERSION=1.7.20 containerd-test sh -c 'script/setup/install-runc && /usr/local/sbin/runc --version'
    # ....
    HEAD is now at 58aa9203 VERSION: release 1.1.13
    go build -trimpath "-buildmode=pie"  -tags "seccomp" -ldflags "-X main.gitCommit=v1.1.13-0-g58aa9203 -X main.version=v1.1.13 " -o runc .
    install -D -m0755 runc /usr/local/sbin/runc
    /go/src/github.com/containerd/containerd
    runc version v1.1.13
    commit: v1.1.13-0-g58aa9203
    spec: 1.0.2-dev
    go: go1.22.5
    libseccomp: 2.5.4

[1]: 6f4d975c40

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2024-08-06 16:52:15 +02:00
Vishal Reddy Gurrala
fc1637d16e
Attest artifacts in release workflow 
Signed-off-by: Vishal Reddy Gurrala <vishalgurrala21@gmail.com>
 2024-08-05 20:54:34 -05:00
Vishal Reddy Gurrala
337d8c52c5
Update release job to generate artifacts attestation 
Signed-off-by: Vishal Reddy Gurrala <vishalgurrala21@gmail.com>
 2024-08-05 20:50:26 -05:00
dependabot[bot]
267fac568d
build(deps): bump the golang-x group with 3 updates 
Bumps the golang-x group with 3 updates: [golang.org/x/mod](https://github.com/golang/mod), [golang.org/x/sync](https://github.com/golang/sync) and [golang.org/x/sys](https://github.com/golang/sys).


Updates `golang.org/x/mod` from 0.19.0 to 0.20.0
- [Commits](https://github.com/golang/mod/compare/v0.19.0...v0.20.0)

Updates `golang.org/x/sync` from 0.7.0 to 0.8.0
- [Commits](https://github.com/golang/sync/compare/v0.7.0...v0.8.0)

Updates `golang.org/x/sys` from 0.22.0 to 0.23.0
- [Commits](https://github.com/golang/sys/compare/v0.22.0...v0.23.0)

---
updated-dependencies:
- dependency-name: golang.org/x/mod
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
- 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-05 23:38:35 +00:00
dependabot[bot]
6814cc3549
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.0 to 2.1.1.
- [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.0...v2.1.1)

---
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-05 23:17:47 +00:00
Maksym Pavlenko
7f707b5e79
Merge pull request #10547 from katexochen/code-flow-delim 
docs/content-flow: fix code fence delimiter
 2024-08-05 17:34:37 +00:00
Paul Meyer
d036988eec docs/content-flow: fix code fence delimiter 
Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
 2024-08-05 12:55:48 +02:00
Swagat Bora
83c26962c2 Remove extra span created in the instrumented service layer 
Signed-off-by: Swagat Bora <sbora@amazon.com>
 2024-08-05 02:34:27 +00:00
Swagat Bora
c0cdcb34f1 Add spans to CRI runtime service and related client methods 
This adds otel spans to CRI service mainly targeting mutating apis which includes:
* Sandbox apis - RunPodSandbox, StopPodSandbox, RemovePodSandbox
* Container apis - CreateContainer, StartContainer, StopContainer, RemoveContainer
* Attach, Exec and Exec Sync
* Containerd client methods: container.go, client.go, process.go and task.go

Signed-off-by: Swagat Bora <sbora@amazon.com>
 2024-08-05 02:34:20 +00:00
Fu Wei
45d8917089
Merge pull request #10284 from ningmingxiao/sync 
support to syncfs after pull by using diff plugin
 2024-08-05 00:58:13 +00:00