[release/1.6] archive: consistently respect value of WithSkipDockerManifest#8345
Merged
kzys merged 2 commits intocontainerd:release/1.6from Apr 5, 2023
Merged
Conversation
|
Hi @jedevc. Thanks for your PR. I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
It was possible to still export the docker-compatible manifest.json file, if a single platform image (as a standalone manifest) was exported, even if the WithSkipDockerManifest option was explicitly set. To resolve this, we remove all references to skipDockerManifest to, adding it instead to the point-of-writing, simplifying the earlier logic and making it clear exactly when this manifest file should be written. Signed-off-by: Justin Chadwell <[email protected]>
Signed-off-by: Justin Chadwell <[email protected]>
jedevc
force-pushed
the
v1.6-export-skip-docker-manifest
branch
from
ab3263b to
ec13b49
Compare
Member
|
/ok-to-test |
estesp
approved these changes
Apr 4, 2023
dcantah
approved these changes
Apr 4, 2023
kzys
approved these changes
Apr 5, 2023
1 task
aravindhp
added a commit
to openshift/containerd
that referenced
this pull request
May 24, 2023
containerd 1.6.21 Welcome to the v1.6.21 release of containerd! The twenty-first patch release for containerd 1.6 contains various fixes and updates. * **update runc binary to v1.1.7 ([containerd#8450](containerd#8450)) * **Remove entry for container from container store on error ([containerd#8456](containerd#8456)) * **oci: partially restore comment on read-only mounts for uid/gid uses ([containerd#8403](containerd#8403)) * **windows: Add ArgsEscaped support for CRI ([containerd#8247](containerd#8247)) * **oci: Use WithReadonlyTempMount when adding users/groups ([containerd#8357](containerd#8357)) * **archive: consistently respect value of WithSkipDockerManifest ([containerd#8345](containerd#8345)) See the changelog for complete list of changes Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Derek McGowan * Sebastiaan van Stijn * Iceber Gu * Kirtana Ashok * Justin Chadwell * Phil Estes * Akihiro Suda * Djordje Lukic * Kazuyoshi Kato * Mike Brown * Wei Fu * kiashok <details><summary>26 commits</summary> <p> * [release/1.6] Prepare release notes for v1.6.21 ([containerd#8463](containerd#8463)) * [`9226c362a`](containerd@9226c36) Add release notes for v1.6.21 * [release/1.6] update go to go1.19.9 ([containerd#8469](containerd#8469)) * [`39566aade`](containerd@39566aa) [release/1.6] update go to go1.19.9 * [release/1.6] fix the task setting the runtime path ([containerd#8454](containerd#8454)) * [`e8840f688`](containerd@e8840f6) skip TestContainerStartWithAbsRuntimePath if the runtime is v1 * [`75ab094de`](containerd@75ab094) integration: add container start test using abs runtime path * [`f49254f0b`](containerd@f49254f) WithRuntimePath uses the TaskInfo.RuntimePath field * [release/1.6 backport] update runc binary to v1.1.7 ([containerd#8450](containerd#8450)) * [`ccb51ff26`](containerd@ccb51ff) update runc binary to v1.1.7 * [release/1.6] Remove entry for container from container store on error ([containerd#8456](containerd#8456)) * [`95d31551d`](containerd@95d3155) Remove entry for container from container store on error * [release/1.6 backport] oci: partially restore comment on read-only mounts for uid/gid uses ([containerd#8403](containerd#8403)) * [`c33eb574d`](containerd@c33eb57) oci: partially restore comment on read-only mounts for uid/gid uses * [release/1.6 ] Add ArgsEscaped support for CRI ([containerd#8247](containerd#8247)) * [`bc2e01303`](containerd@bc2e013) Fix argsEscaped tests * [`8b81d5acc`](containerd@8b81d5a) Add ArgsEscaped support for CRI * [release/1.6 backport] update runc binary to v1.1.6 ([containerd#8385](containerd#8385)) * [`57d953482`](containerd@57d9534) update runc binary to v1.1.6 * [release/1.6 backport] oci: Use WithReadonlyTempMount when adding users/groups ([containerd#8357](containerd#8357)) * [`fb5e663d0`](containerd@fb5e663) oci: Use WithReadonlyTempMount when adding users/groups * [release/1.6] update go to go1.19.8 ([containerd#8353](containerd#8353)) * [`26efb8fd5`](containerd@26efb8f) [release/1.6] update go to go1.19.8 * [release/1.6] archive: consistently respect value of WithSkipDockerManifest ([containerd#8345](containerd#8345)) * [`ec13b497e`](containerd@ec13b49) export: add test for WithSkipDockerManifest * [`d1f3771c4`](containerd@d1f3771) archive: consistently respect value of WithSkipDockerManifest </p> </details> This release has no dependency changes Previous release can be found at [v1.6.20](https://github.com/containerd/containerd/releases/tag/v1.6.20)
Mengkzhaoyun
pushed a commit
to open-beagle/containerd
that referenced
this pull request
Jun 9, 2023
containerd 1.6.21 Welcome to the v1.6.21 release of containerd! The twenty-first patch release for containerd 1.6 contains various fixes and updates. * **update runc binary to v1.1.7 ([#8450](containerd/containerd#8450)) * **Remove entry for container from container store on error ([#8456](containerd/containerd#8456)) * **oci: partially restore comment on read-only mounts for uid/gid uses ([#8403](containerd/containerd#8403)) * **windows: Add ArgsEscaped support for CRI ([#8247](containerd/containerd#8247)) * **oci: Use WithReadonlyTempMount when adding users/groups ([#8357](containerd/containerd#8357)) * **archive: consistently respect value of WithSkipDockerManifest ([#8345](containerd/containerd#8345)) See the changelog for complete list of changes Please try out the release binaries and report any issues at https://github.com/containerd/containerd/issues. * Derek McGowan * Sebastiaan van Stijn * Iceber Gu * Kirtana Ashok * Justin Chadwell * Phil Estes * Akihiro Suda * Djordje Lukic * Kazuyoshi Kato * Mike Brown * Wei Fu * kiashok <details><summary>26 commits</summary> <p> * [release/1.6] Prepare release notes for v1.6.21 ([#8463](containerd/containerd#8463)) * [`9226c362a`](containerd/containerd@9226c36) Add release notes for v1.6.21 * [release/1.6] update go to go1.19.9 ([#8469](containerd/containerd#8469)) * [`39566aade`](containerd/containerd@39566aa) [release/1.6] update go to go1.19.9 * [release/1.6] fix the task setting the runtime path ([#8454](containerd/containerd#8454)) * [`e8840f688`](containerd/containerd@e8840f6) skip TestContainerStartWithAbsRuntimePath if the runtime is v1 * [`75ab094de`](containerd/containerd@75ab094) integration: add container start test using abs runtime path * [`f49254f0b`](containerd/containerd@f49254f) WithRuntimePath uses the TaskInfo.RuntimePath field * [release/1.6 backport] update runc binary to v1.1.7 ([#8450](containerd/containerd#8450)) * [`ccb51ff26`](containerd/containerd@ccb51ff) update runc binary to v1.1.7 * [release/1.6] Remove entry for container from container store on error ([#8456](containerd/containerd#8456)) * [`95d31551d`](containerd/containerd@95d3155) Remove entry for container from container store on error * [release/1.6 backport] oci: partially restore comment on read-only mounts for uid/gid uses ([#8403](containerd/containerd#8403)) * [`c33eb574d`](containerd/containerd@c33eb57) oci: partially restore comment on read-only mounts for uid/gid uses * [release/1.6 ] Add ArgsEscaped support for CRI ([#8247](containerd/containerd#8247)) * [`bc2e01303`](containerd/containerd@bc2e013) Fix argsEscaped tests * [`8b81d5acc`](containerd/containerd@8b81d5a) Add ArgsEscaped support for CRI * [release/1.6 backport] update runc binary to v1.1.6 ([#8385](containerd/containerd#8385)) * [`57d953482`](containerd/containerd@57d9534) update runc binary to v1.1.6 * [release/1.6 backport] oci: Use WithReadonlyTempMount when adding users/groups ([#8357](containerd/containerd#8357)) * [`fb5e663d0`](containerd/containerd@fb5e663) oci: Use WithReadonlyTempMount when adding users/groups * [release/1.6] update go to go1.19.8 ([#8353](containerd/containerd#8353)) * [`26efb8fd5`](containerd/containerd@26efb8f) [release/1.6] update go to go1.19.8 * [release/1.6] archive: consistently respect value of WithSkipDockerManifest ([#8345](containerd/containerd#8345)) * [`ec13b497e`](containerd/containerd@ec13b49) export: add test for WithSkipDockerManifest * [`d1f3771c4`](containerd/containerd@d1f3771) archive: consistently respect value of WithSkipDockerManifest </p> </details> This release has no dependency changes Previous release can be found at [v1.6.20](https://github.com/containerd/containerd/releases/tag/v1.6.20)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
🍒 Cherry-pick #8213
Cherry-pick of the tests isn't completely clean, since the tests have changed since 1.6 to use temporary files instead of in-memory buffers.