Commit Graph

14496 Commits

Author SHA1 Message Date
Derek McGowan
27de5fea73
Merge pull request #10331 from dmcgowan/prepare-v2.0.0-rc.3
Prepare v2.0.0-rc.3 release
2024-06-14 06:21:27 -07:00
Sebastiaan van Stijn
587ee80f61
pkg/tracing: LogrusHook.Fire: micro-optimisation
Check span.IsRecording first, as it's a more lightweight check than
span.SpanContext().IsValid()

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-14 12:12:22 +02:00
Sebastiaan van Stijn
ccf7938126
pkg/tracing: remove direct use of github.com/sirupsen/logrus
While the hook is intended to be used with logrus, we don't need to have
the direct import; use the aliases provided by the containerd/log module
instead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-14 12:08:51 +02:00
Sebastiaan van Stijn
4203e2de8d
pkg/tracing/plugin: rename var that collided with import
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-14 11:57:27 +02:00
Sebastiaan van Stijn
e2e09b384a
pkg/tracing: rename func that shadowed builtin, rm makeSpanName
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-14 11:56:06 +02:00
Abel Feng
15887d7efc sandbox: add update api for controller
Signed-off-by: Abel Feng <fshb1988@gmail.com>
2024-06-14 02:31:51 +00:00
dependabot[bot]
e69ad94421
build(deps): bump the k8s group across 1 directory with 4 updates
Bumps the k8s group with 4 updates in the / directory: [k8s.io/apimachinery](https://github.com/kubernetes/apimachinery), [k8s.io/client-go](https://github.com/kubernetes/client-go), [k8s.io/component-base](https://github.com/kubernetes/component-base) and [k8s.io/kubelet](https://github.com/kubernetes/kubelet).


Updates `k8s.io/apimachinery` from 0.30.0 to 0.30.2
- [Commits](https://github.com/kubernetes/apimachinery/compare/v0.30.0...v0.30.2)

Updates `k8s.io/client-go` from 0.30.0 to 0.30.2
- [Changelog](https://github.com/kubernetes/client-go/blob/master/CHANGELOG.md)
- [Commits](https://github.com/kubernetes/client-go/compare/v0.30.0...v0.30.2)

Updates `k8s.io/component-base` from 0.30.0 to 0.30.2
- [Commits](https://github.com/kubernetes/component-base/compare/v0.30.0...v0.30.2)

Updates `k8s.io/kubelet` from 0.30.0 to 0.30.2
- [Commits](https://github.com/kubernetes/kubelet/compare/v0.30.0...v0.30.2)

---
updated-dependencies:
- dependency-name: k8s.io/apimachinery
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
- dependency-name: k8s.io/client-go
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
- dependency-name: k8s.io/component-base
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
- dependency-name: k8s.io/kubelet
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: k8s
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-13 18:32:12 +00:00
Akihiro Suda
e49d3fd1bc
Merge pull request #10334 from thaJeztah/bump_runc_1.1.13
update runc binary to v1.1.13
2024-06-13 17:47:12 +00:00
harshitasao
0f76e35fd5 added the openssf scorecard badge
Signed-off-by: harshitasao <harshitasao@gmail.com>
2024-06-13 22:59:43 +05:30
Kern Walster
5b8dfbd111 Allow proxy plugins to have capabilities
Signed-off-by: Kern Walster <walster@amazon.com>
2024-06-13 17:13:57 +00:00
Mike Brown
98ebb3ecff
Merge pull request #9737 from everpeace/kep-3169-SupplementalGroupsPolicy
KEP-3619: Fine-grained SupplementalGroups control
2024-06-13 16:59:20 +00:00
Sebastiaan van Stijn
cc2cedae06
Revert "install-runc: pin Go to 1.21"
Now that we're on runc v1.1.13, we no longer need to pin the
go version fo runc to go1.21

This reverts commit fef78c1024.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 18:38:31 +02:00
Sebastiaan van Stijn
3c097352af
update runc binary to v1.1.13
full diff: https://github.com/opencontainers/runc/compare/v1.1.12...v1.1.13

Release notes:

* If building with Go 1.22.x, make sure to use 1.22.4 or a later version.

* Support go 1.22.4+.
* runc list: fix race with runc delete.
* Fix set nofile rlimit error.
* libct/cg/fs: fix setting rt_period vs rt_runtime.
* Fix a debug msg for user ns in nsexec.
* script/*: fix gpg usage wrt keyboxd.
* CI fixes and misc backports.
* Fix codespell warnings.

* Silence security false positives from golang/net.
* libcontainer: allow containers to make apps think fips is enabled/disabled for testing.
* allow overriding VERSION value in Makefile.
* Vagrantfile.fedora: bump Fedora to 39.
* ci/cirrus: rm centos stream 8.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 18:38:25 +02:00
Derek McGowan
8c13ed1b8e
Prepare v2.0.0-rc.3 release
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-12 21:52:37 -07:00
Fu Wei
c75f6d404d
Merge pull request #10323 from siretart/debian/bug.1044768
Allow running test in usernamespace
2024-06-13 03:43:09 +00:00
Fu Wei
a60edaf24c
Merge pull request #10330 from AkihiroSuda/remove-pkg-seed
Remove pkg/seed
2024-06-13 01:25:59 +00:00
Akihiro Suda
86b8a88241
Remove pkg/seed
Since Go 1.20, math/rand does not need explicit seeding:
https://go.dev/doc/go1.20#minor_library_changes

Go <= 1.19 is no longer supported due to EOL.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-06-13 08:50:28 +09:00
Maksym Pavlenko
e4c61fd33f
Merge pull request #10319 from containerd/dependabot/go_modules/golang-x-ba92570477
build(deps): bump the golang-x group with 2 updates
2024-06-12 17:45:20 +00:00
Fu Wei
0de7043c3a
Merge pull request #10322 from thaJeztah/bump_platforms
vendor: github.com/containerd/platforms v0.2.1
2024-06-12 14:47:28 +00:00
Reinhard Tartler
09d3e20d3a Allow running test in usernamespace
Debian has started building packages with usernamespaces
to disable network access and similar isolation features. The
containerd package executes a unit test that fails in that
scenario, see https://bugs.debian.org/1070411

The code contains a conditional on whether it is running in
usernamepsace. This commit expands the unit test to cover
this behavior; it was previously untested.

The easiest way to reproduce this issue is to prefix the test
invocaiton with 'unshare -nr go test [...]'

Signed-off-by: Reinhard Tartler <siretart@gmail.com>
2024-06-12 00:36:54 +00:00
Shingo Omura
8bcffa9446
KEP-3619: Fine grained SupplementalGroups control
Signed-off-by: Shingo Omura <everpeace@gmail.com>
2024-06-12 09:10:40 +09:00
Sebastiaan van Stijn
87dd4309db
vendor: github.com/containerd/platforms v0.2.1
- Remove hcsshim import from repo
    - un-exports GetOsVersion
- Update windows matcher to not compare empty os version

full diff: https://github.com/containerd/platforms/compare/v0.2.0...v0.2.1

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 00:54:03 +02:00
Maksym Pavlenko
e840d1d9cc
Merge pull request #10286 from dmcgowan/update-tls-fallback-default-ports
Allow fallback across default ports
2024-06-11 17:11:42 +00:00
Maksym Pavlenko
9c4ca8676b
Merge pull request #10320 from containerd/dependabot/go_modules/github.com/checkpoint-restore/checkpointctl-1.2.0
build(deps): bump github.com/checkpoint-restore/checkpointctl from 1.1.0 to 1.2.0
2024-06-11 17:10:49 +00:00
Maksym Pavlenko
8247b5755a
Merge pull request #10321 from ktock/ctr-local-flag-deps
ctr: return explicit errors for flags unsupported by transfer service
2024-06-11 17:10:28 +00:00
Derek McGowan
3debabbccd
Merge pull request #10324 from ktock/golangci-lint-1.59.1
CI:  bump up golangci-lint to v1.59.1
2024-06-11 13:13:19 +00:00
Kohei Tokunaga
939135ae36
CI: golangci-lint v1.59.1
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2024-06-11 20:17:35 +09:00
Kohei Tokunaga
df7f6ba5b9
ctr: return explicit errors for flags unsupported by transfer service
ctr currently silently ignores several flags by default (without --local) and
the user can't know which flags are supported until they see the code.
This commit fixes ctr to return an explicit error when it finds an unsupported
flag.

Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2024-06-11 12:08:47 +09:00
dependabot[bot]
686a610ee7
build(deps): bump github.com/checkpoint-restore/checkpointctl
Bumps [github.com/checkpoint-restore/checkpointctl](https://github.com/checkpoint-restore/checkpointctl) from 1.1.0 to 1.2.0.
- [Release notes](https://github.com/checkpoint-restore/checkpointctl/releases)
- [Commits](https://github.com/checkpoint-restore/checkpointctl/compare/v1.1.0...v1.2.0)

---
updated-dependencies:
- dependency-name: github.com/checkpoint-restore/checkpointctl
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-10 23:34:36 +00:00
dependabot[bot]
156458e544
build(deps): bump the golang-x group with 2 updates
Bumps the golang-x group with 2 updates: [golang.org/x/mod](https://github.com/golang/mod) and [golang.org/x/sys](https://github.com/golang/sys).


Updates `golang.org/x/mod` from 0.17.0 to 0.18.0
- [Commits](https://github.com/golang/mod/compare/v0.17.0...v0.18.0)

Updates `golang.org/x/sys` from 0.20.0 to 0.21.0
- [Commits](https://github.com/golang/sys/compare/v0.20.0...v0.21.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/sys
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: golang-x
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-10 23:34:26 +00:00
Samuel Karp
4a18adcfca
Merge pull request #10304 from AkihiroSuda/ci-add-back-rocky8
CI: add back EL 8
2024-06-10 16:50:15 +00:00
Akihiro Suda
08c1e12e9b
CI: add back EL 8
Add back EL 8 to test legacy compatibility

Follow-up to PR 10297

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2024-06-08 19:50:39 +09:00
Maksym Pavlenko
378a502fb2
Merge pull request #10310 from kiashok/update-hcsshim-0.12.4
Update hcsshim tag to 0.12.4
2024-06-07 18:40:32 +00:00
Kirtana Ashok
149ca6880a Update hcsshim tag to 0.12.4
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2024-06-07 07:47:01 -07:00
Maksym Pavlenko
45bc430dd1
Merge pull request #10294 from dmcgowan/fail-integration-test-on-plugin-fail
Fail integration test early when a plugin load fails
2024-06-06 00:44:04 +00:00
Derek McGowan
b1a23c495a
Fail integration test early when a plugin load fails
Avoid running tests when a plugin fails to load and return the init
error from the plugin. This prevents the test failing later with an
unhelpful error and attempting to find the actual error in the daemon
logs.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-05 16:58:03 -07:00
Derek McGowan
d23c4b8b53
Use unix and windows specific connection error checks
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-05 14:39:57 -07:00
Derek McGowan
02b6c6939f
Allow fallback across default ports
When no port is specified, allow falling back from 443 to 80 when
http is specified along with a TLS configuration.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-05 14:39:57 -07:00
Maksym Pavlenko
34d3c17ae2
Merge pull request #10291 from ktock/push-platform-conf
Transfer: Push: Enable to specify platforms
2024-06-05 21:28:09 +00:00
Maksym Pavlenko
4c2737939e
Merge pull request #10293 from containerd/dependabot/go_modules/github.com/containerd/containerd/api-1.8.0-rc.2
build(deps): bump github.com/containerd/containerd/api from 1.8.0-rc.0 to 1.8.0-rc.2
2024-06-05 21:26:49 +00:00
dependabot[bot]
80ce8bd612
build(deps): bump github.com/containerd/containerd/api
Bumps [github.com/containerd/containerd/api](https://github.com/containerd/containerd) from 1.8.0-rc.0 to 1.8.0-rc.2.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/main/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/api/v1.8.0-rc.0...api/v1.8.0-rc.2)

---
updated-dependencies:
- dependency-name: github.com/containerd/containerd/api
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-05 08:09:12 +00:00
Fu Wei
d4148d94cc
Merge pull request #10302 from ktock/ctr-pull-label
ctr: pull: Do not ignore labels when transfer service is used
2024-06-05 06:06:11 +00:00
Kohei Tokunaga
cde2527fce
ctr: pull: Do not ignore labels when transfer service is used
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2024-06-05 12:26:00 +09:00
Samuel Karp
222db53917
Merge pull request #10296 from dmcgowan/update-go-1.22.4
Update Go version to 1.22.4
2024-06-04 23:48:30 +00:00
Derek McGowan
1c123efb41
Update Go version to 1.22.4
Includes fix for a symlink race on remove.
Updates 1.21 to 1.21.11 for runc install which also includes the
symlink fix.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-04 15:46:09 -07:00
Derek McGowan
6005d839be
Merge pull request #10297 from dmcgowan/update-rockylinux-vagrant
Update rockylinux vagrant build
2024-06-04 15:45:23 -07:00
Derek McGowan
e1e793e4ab
Update rockylinux vagrant build
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-04 14:38:12 -07:00
Kohei Tokunaga
5611fdd4af
Transfer: Push: Enable to specify platforms
Signed-off-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>
2024-06-04 10:02:13 +09:00
Maksym Pavlenko
1369112514
Merge pull request #10287 from ktock/transfer-push-dup
Transfer: Push: fix failure on pushing duplicated blobs
2024-06-04 00:11:56 +00:00
Derek McGowan
5d6a94a54c
Merge pull request #10243 from dmcgowan/update-shim-manager-config
Cleanup shim manager configuration
2024-06-03 17:22:36 +00:00