Commit Graph

12638 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
6ff3e09d20 migrate platforms package to github.com/containerd/platforms
This updates the platforms package to be an alias for the new platforms module.
This helps transitioning consumers to the new module, and makes sure that
containerd v2 and v1 use the same definitions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-13 00:58:28 +02:00
Derek McGowan
3eb3e53ecd Merge pull request #10326 from thaJeztah/1.7_bump_compress
[release/1.7 backport] go.mod: github.com/klauspost/compress v1.16.7
2024-06-12 15:57:41 -07:00
Akihiro Suda
327a3ac61d go.mod: github.com/klauspost/compress v1.16.7
https://github.com/imdario/mergo/compare/v0.3.13...v1.0.0

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
(cherry picked from commit 1f2216cc78)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 22:57:30 +02:00
Sebastiaan van Stijn
d0d1264a65 vendor: github.com/klauspost/compress v1.16.5
partial backport of 56d80f81a2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-12 22:57:27 +02:00
Maksym Pavlenko
2b6d2e9385 Merge pull request #10325 from dmcgowan/1.7-vagrant-gha
[release/1.7] Use Github Actions to run Vagrant CI
2024-06-12 10:44:56 -07:00
Derek McGowan
02b8dd5ffc Remove cirrus configuration
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-11 14:50:40 -07:00
Derek McGowan
31d951bf5b Run vagrant integration tests as github actions
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-11 14:41:27 -07:00
Akihiro Suda
e26c152b78 Merge pull request #10316 from thaJeztah/1.7_backport_replace_reference
[release/1.7 backport] replace reference/docker for github.com/distribution/reference v0.6.0
2024-06-11 16:19:46 +09:00
Derek McGowan
067c989b2b Merge pull request #10315 from thaJeztah/1.7_backport_bump_bbolt_1.3.10
[release/1.7 backport] build(deps): bump go.etcd.io/bbolt from 1.3.9 to 1.3.10
2024-06-10 17:10:44 -07:00
dependabot[bot]
97abbe9cba build(deps): bump github.com/distribution/reference from 0.5.0 to 0.6.0
Bumps [github.com/distribution/reference](https://github.com/distribution/reference) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/distribution/reference/releases)
- [Commits](https://github.com/distribution/reference/compare/v0.5.0...v0.6.0)

---
updated-dependencies:
- dependency-name: github.com/distribution/reference
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 362fcf2d27)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 18:33:30 +02:00
Sebastiaan van Stijn
a00a2d20a3 reference/docker: remove deprecated SplitHostname
This function is deprecated in distribution/reference, and removed
in distribution/reference v0.6; reference.Domain or reference.Path
should be used instead.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 18:29:17 +02:00
Sebastiaan van Stijn
b38c0f2ef8 replace reference/docker for github.com/distribution/reference v0.5.0
The reference/docker package was a fork of github.com/distribution/distribution,
which could not easily be used as a direct dependency, as it brought many other
dependencies with it.

The "reference' package has now moved to a separate repository, which means
we can replace the local fork, and use the upstream implementation again.

The new module was extracted from the distribution repository at commit:
b9b19409cf

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 4923470902)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 18:26:31 +02:00
dependabot[bot]
fef432bfeb build(deps): bump go.etcd.io/bbolt from 1.3.9 to 1.3.10
Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.9 to 1.3.10.
- [Release notes](https://github.com/etcd-io/bbolt/releases)
- [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.9...v1.3.10)

---
updated-dependencies:
- dependency-name: go.etcd.io/bbolt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit a6e417dc63)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:40:50 +02:00
Sebastiaan van Stijn
487c61bfbb vendor: go.etcd.io/bbolt v1.3.9
full diff: https://github.com/etcd-io/bbolt/compare/v1.3.8...v1.3.9

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 154ed26a77)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:37:50 +02:00
dependabot[bot]
7211f87c48 build(deps): bump golang.org/x/sync from 0.4.0 to 0.5.0
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.4.0 to 0.5.0.
- [Commits](https://github.com/golang/sync/compare/v0.4.0...v0.5.0)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit db43e3d1f7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:37:40 +02:00
Sebastiaan van Stijn
e908c3e6fc vendor: golang.org/x/sync v0.4.0
no changes in vendored code

full diff: https://github.com/golang/sync/compare/v0.3.0...v0.4.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:35:09 +02:00
dependabot[bot]
d814be5ce8 build(deps): bump go.etcd.io/bbolt from 1.3.7 to 1.3.8
Bumps [go.etcd.io/bbolt](https://github.com/etcd-io/bbolt) from 1.3.7 to 1.3.8.
- [Release notes](https://github.com/etcd-io/bbolt/releases)
- [Commits](https://github.com/etcd-io/bbolt/compare/v1.3.7...v1.3.8)

---
updated-dependencies:
- dependency-name: go.etcd.io/bbolt
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 39ba0347ee)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-06-08 15:28:52 +02:00
Derek McGowan
895f104996 Merge pull request #10306 from anmaxvl/hpc-work-dir
[release/1.7]: HPC working directory fix in pkg/cri/server code
2024-06-07 16:43:23 -07:00
Maksim An
33b62936ea [release/1.7]: HPC working directory fix in pkg/cri/server code
Change in 989f1ec54f assumed a single
place (pkg/cri/sbserver) where this had to be fixed.

Commit in main branch for reference:
(cherry picked from commit c7ea06a69b)

Signed-off-by: Maksim An <maksiman@microsoft.com>
2024-06-06 12:31:54 -07:00
Derek McGowan
ae71819c4f Merge pull request #10301 from dmcgowan/prepare-v1.7.18
[release/1.7] Prepare release notes for v1.7.18
v1.7.18
2024-06-04 19:05:23 -07:00
Derek McGowan
9426aab62b Prepare release notes for v1.7.18
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-04 17:48:20 -07:00
Derek McGowan
1d324dbbd4 Merge pull request #10298 from dmcgowan/1.7-update-go
[release/1.7] Update Go version to 1.21.11
2024-06-04 17:45:43 -07:00
Derek McGowan
cdd3ea9135 Update Go version to 1.21.11
Includes fix for a symlink race on remove.

Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-06-04 15:40:58 -07:00
Derek McGowan
0a137f0aae Merge pull request #10277 from thaJeztah/1.7_backport_remove_use_of_platform_alias
[release/1.7] remove uses of platforms.Platform alias
2024-05-29 12:24:59 -07:00
Sebastiaan van Stijn
1e3c662d6c [release/1.7] remove uses of platforms.Platform alias
Commit 3c8469a782 removed uses of the api
types.Platform type from public interfaces, instead using the type from
the OCI image spec.

For convenience, it also introduced an alias in the platforms package.
While this alias allows packages that already import containerd's
platforms package (now a separate module), it may also cause confusion
(it's not clear that it's an alias for the OCI type), and for packages
that do not depend on containerd's platforms package / module may now
be resulting in an extra dependency.

Let's remove the use of this alias, and instead use the OCI type directly.

Equivalent of 446e63579c in main.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-28 22:59:44 +02:00
Phil Estes
300a6de901 Merge pull request #10269 from thaJeztah/1.7_migrate_containerd_log
[release/1.7] migrate log imports to github.com/containerd/log module
2024-05-28 09:29:29 -04:00
Sebastiaan van Stijn
0af6825b1e migrate logs imports to github.com/containerd/log module
Import the log module directly, instead of using the aliases that are
provided in the log package. This helps find code-paths that still depend
on the old location, and that haven't migrated yet to the new module.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-27 14:38:51 +02:00
Derek McGowan
be820ac933 Merge pull request #10266 from thaJeztah/1.7_migrate_to_errdefs_module
[release/1.7] migrate errdefs package to github.com/containerd/errdefs module
2024-05-26 15:00:17 -07:00
Derek McGowan
566c535aeb Merge pull request #10261 from k8s-infra-cherrypick-robot/cherry-pick-10257-to-release/1.7
[release/1.7] core/image: fix usage of "unknown" platform
2024-05-26 14:59:59 -07:00
Derek McGowan
d054b87572 Merge pull request #10265 from austinvazquez/enable-make-latest
[release/1.7] Explicitly set release latest to true
2024-05-26 14:38:46 -07:00
Sebastiaan van Stijn
308341a446 replace uses of github.com/containerd/containerd/errdefs
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-26 13:21:40 +02:00
Sebastiaan van Stijn
47ff8cfce0 migrate errdefs package to github.com/containerd/errdefs module
This updates the errdefs package to be an alias for the new errdefs module.
This helps transitioning consumers to the new module, and makes sure that
containerd v2 and v1 use the same definitions.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-26 13:19:16 +02:00
Austin Vazquez
5b0480009c Explicitly set release latest to true
This change explicitly sets release/1.7 releases as latest.

Signed-off-by: Austin Vazquez <macedonv@amazon.com>
(cherry picked from commit 2d73340c2c)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
2024-05-25 15:32:56 +00:00
dependabot[bot]
d669b100d5 build(deps): bump softprops/action-gh-release from 1 to 2
Bumps [softprops/action-gh-release](https://github.com/softprops/action-gh-release) from 1 to 2.
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/v1...v2)

---
updated-dependencies:
- dependency-name: softprops/action-gh-release
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
(cherry picked from commit 21d3fedf44)
Signed-off-by: Austin Vazquez <macedonv@amazon.com>
2024-05-25 15:32:20 +00:00
Akhil Mohan
f4d11912a7 core/image: fix usage of "unknown" platform
"unknown" should not be returned as a valid platform
supported by the image

Signed-off-by: Akhil Mohan <akhilerm@gmail.com>
2024-05-25 05:12:18 +00:00
Derek McGowan
3a4de459a6 Merge pull request #10235 from dmcgowan/prepare-v1.7.17
[release/1.7] Prepare release notes for v1.7.17
v1.7.17
2024-05-16 14:46:07 -07:00
Derek McGowan
114b07b976 Prepare release notes for v1.7.17
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-05-15 22:20:13 -07:00
Derek McGowan
2441c2d796 Merge pull request #10209 from austinvazquez/cherry-pick-a782fd6da2fa9fa350ef754b68b5e80261cfeddc-to-release-1.7
[release/1.7] Use LOOP_CONFIGURE when creating loop devices
2024-05-15 21:33:25 -07:00
Kazuyoshi Kato
62af10773f Merge pull request #10233 from dmcgowan/1.7-unpack-fetch-all
[release/1.7] Unpack fetch all
2024-05-15 15:20:47 -07:00
Derek McGowan
a3c0f2f61e Merge pull request #10232 from kiashok/update-shim-0.11.4
[release/1.7] Update hcsshim tag to v0.11.5
2024-05-15 13:38:14 -07:00
Derek McGowan
1573ea598e Update ctr image pull all platforms
Allows supporting fetching of all platforms while unpacking for a subset
of platforms.

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 2788604e49)
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-05-15 11:58:41 -07:00
Derek McGowan
32b594f1b2 Update unpacker to always fetch all
When a set of layers are provided to the unpacker, then the unpacker
should still fetch them regardless of whether they will be used for
unpack. The image handler filters are responsible for removing content
which is not intended to be fetched. Currently there is no way to use an
unpacker and also fetch all platforms.

Signed-off-by: Derek McGowan <derek@mcg.dev>
(cherry picked from commit 681a083fab)
Signed-off-by: Derek McGowan <derek@mcg.dev>
2024-05-15 11:54:54 -07:00
Kirtana Ashok
5a03a3aeee Update hcsshim tag to v0.11.5
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2024-05-15 10:54:10 -07:00
Akihiro Suda
b5aec32f64 Merge pull request #10221 from kiashok/update-ttrpc-release-1.7
[release/1.7] Update ttrpc tag to 1.2.4
2024-05-15 22:20:36 +09:00
Derek McGowan
36bbb4de8e Merge pull request #10210 from swagatbora90/preserve-flags-cherry-pick-1.7
[release/1.7] Preserve CL_UNPRIVILEGED locked flags during remount of bind mounts
2024-05-14 21:29:27 -07:00
Swagat Bora
ad85652fa1 Preserve CL_UNPRIVILEGED locked flags during remount of bind mounts
Signed-off-by: Swagat Bora <sbora@amazon.com>
2024-05-14 21:32:36 +00:00
Kirtana Ashok
9a1eda40f8 update ttrpc tag to 1.2.4
Signed-off-by: Kirtana Ashok <kiashok@microsoft.com>
2024-05-14 13:51:22 -07:00
Maksym Pavlenko
f2cce985cf Merge pull request #10229 from k8s-infra-cherrypick-robot/cherry-pick-10219-to-release/1.7
[release/1.7] Update instrumentation fuzzer with new flag
2024-05-14 09:12:02 -07:00
Phil Estes
582f3f43d5 Update instrumentation fuzzer with new flag
Signed-off-by: Phil Estes <estesp@gmail.com>
2024-05-14 13:04:09 +00:00
Derek McGowan
970f206127 Merge pull request #10215 from austinvazquez/vendor-containerd-imgcrypt-1.1.8-to-release-1.7
[release/1.7] vendor: github.com/containerd/imgcrypt@v1.1.8
2024-05-13 16:24:54 -07:00