[release/1.6] backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed#8888
Merged
fuweid merged 1 commit intocontainerd:release/1.6from Jul 30, 2023
Conversation
"ro" was not parsed out of the string, so it was passed as part of data to mount(). This would lead to mount() returning an invalid argument code. Separate out the "ro" option, much like "userxattr", which will allow the MS-RDONLY mountflag to get set. Signed-off-by: Ben Foster <bpfoster@gmail.com> (cherry picked from commit f3daf32)
dcantah
approved these changes
Jul 29, 2023
aravindhp
added a commit
to openshift/containerd
that referenced
this pull request
Aug 21, 2023
containerd 1.6.23 Welcome to the v1.6.23 release of containerd! The twenty-third patch release for containerd 1.6 contains various fixes and updates. * **Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854)) * **cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927)) * **Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908)) * **update to go1.19.12 ([containerd#8905](containerd#8905)) * **backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888)) 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. * Kirtana Ashok * Maksym Pavlenko * Austin Vazquez * Ben Foster * Derek McGowan * Mike Brown * Phil Estes * Rodrigo Campos * Sebastiaan van Stijn * Wei Fu <details><summary>13 commits</summary> <p> * [release/1.6] Add release notes for v1.6.23 ([containerd#8939](containerd#8939)) * [`e297a668f`](containerd@e297a66) Add release notes for v1.6.23 * [release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854)) * [`f51bf1960`](containerd@f51bf19) Add support for stable ABI windows versions * [`43a02c0b2`](containerd@43a02c0) Update hcsshim tag to v0.9.10 * [release/1.6] cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927)) * [`cc5b0a21b`](containerd@cc5b0a2) cri: Don't use rel path for image volumes * [release/1.6 backport] Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908)) * [`4238cff1c`](containerd@4238cff) Upgrade GitHub actions packages in release workflow * [release/1.6] update to go1.19.12 ([containerd#8905](containerd#8905)) * [`00d1092b7`](containerd@00d1092) update to go1.19.12 * [release/1.6] backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888)) * [`47d73b2de`](containerd@47d73b2) Fix ro mount option being passed </p> </details> * **github.com/Microsoft/hcsshim** v0.9.8 -> v0.9.10 Previous release can be found at [v1.6.22](https://github.com/containerd/containerd/releases/tag/v1.6.22)
aravindhp
added a commit
to openshift/containerd
that referenced
this pull request
Aug 21, 2023
containerd 1.6.23 Welcome to the v1.6.23 release of containerd! The twenty-third patch release for containerd 1.6 contains various fixes and updates. * **Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854)) * **cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927)) * **Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908)) * **update to go1.19.12 ([containerd#8905](containerd#8905)) * **backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888)) 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. * Kirtana Ashok * Maksym Pavlenko * Austin Vazquez * Ben Foster * Derek McGowan * Mike Brown * Phil Estes * Rodrigo Campos * Sebastiaan van Stijn * Wei Fu <details><summary>13 commits</summary> <p> * [release/1.6] Add release notes for v1.6.23 ([containerd#8939](containerd#8939)) * [`e297a668f`](containerd@e297a66) Add release notes for v1.6.23 * [release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854)) * [`f51bf1960`](containerd@f51bf19) Add support for stable ABI windows versions * [`43a02c0b2`](containerd@43a02c0) Update hcsshim tag to v0.9.10 * [release/1.6] cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927)) * [`cc5b0a21b`](containerd@cc5b0a2) cri: Don't use rel path for image volumes * [release/1.6 backport] Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908)) * [`4238cff1c`](containerd@4238cff) Upgrade GitHub actions packages in release workflow * [release/1.6] update to go1.19.12 ([containerd#8905](containerd#8905)) * [`00d1092b7`](containerd@00d1092) update to go1.19.12 * [release/1.6] backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888)) * [`47d73b2de`](containerd@47d73b2) Fix ro mount option being passed </p> </details> * **github.com/Microsoft/hcsshim** v0.9.8 -> v0.9.10 Previous release can be found at [v1.6.22](https://github.com/containerd/containerd/releases/tag/v1.6.22)
aravindhp
added a commit
to openshift/containerd
that referenced
this pull request
Aug 21, 2023
containerd 1.6.23 Welcome to the v1.6.23 release of containerd! The twenty-third patch release for containerd 1.6 contains various fixes and updates. * **Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854)) * **cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927)) * **Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908)) * **update to go1.19.12 ([containerd#8905](containerd#8905)) * **backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888)) 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. * Kirtana Ashok * Maksym Pavlenko * Austin Vazquez * Ben Foster * Derek McGowan * Mike Brown * Phil Estes * Rodrigo Campos * Sebastiaan van Stijn * Wei Fu <details><summary>13 commits</summary> <p> * [release/1.6] Add release notes for v1.6.23 ([containerd#8939](containerd#8939)) * [`e297a668f`](containerd@e297a66) Add release notes for v1.6.23 * [release/1.6] Add stable ABI support in windows platform matcher + update hcsshim tag ([containerd#8854](containerd#8854)) * [`f51bf1960`](containerd@f51bf19) Add support for stable ABI windows versions * [`43a02c0b2`](containerd@43a02c0) Update hcsshim tag to v0.9.10 * [release/1.6] cri: Don't use rel path for image volumes ([containerd#8927](containerd#8927)) * [`cc5b0a21b`](containerd@cc5b0a2) cri: Don't use rel path for image volumes * [release/1.6 backport] Upgrade GitHub actions packages in release workflow ([containerd#8908](containerd#8908)) * [`4238cff1c`](containerd@4238cff) Upgrade GitHub actions packages in release workflow * [release/1.6] update to go1.19.12 ([containerd#8905](containerd#8905)) * [`00d1092b7`](containerd@00d1092) update to go1.19.12 * [release/1.6] backport: ro option for userxattr mount check + cherry-pick: Fix ro mount option being passed ([containerd#8888](containerd#8888)) * [`47d73b2de`](containerd@47d73b2) Fix ro mount option being passed </p> </details> * **github.com/Microsoft/hcsshim** v0.9.8 -> v0.9.10 Previous release can be found at [v1.6.22](https://github.com/containerd/containerd/releases/tag/v1.6.22)
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
4 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.
Backport of #8852 to create the effect of adding #7008 to
release/1.6(which was never done), and then applying the recent fix in #8852 so that both issues are solved for this LTS branch."ro" was not parsed out of the string, so it was passed as part of data to mount().
This would lead to mount() returning an invalid argument code. Separate out the "ro" option, much like "userxattr", which will allow the MS-RDONLY mountflag to get set.
Signed-off-by: Ben Foster bpfoster@gmail.com
(cherry picked from commit f3daf32)