Skip to content

[release/1.7] Remove overlayfs volatile option on temp mounts #10332

Merged
mxpv merged 3 commits intocontainerd:release/1.7from
fuweid:cp-17-9555
Jun 14, 2024
Merged

[release/1.7] Remove overlayfs volatile option on temp mounts #10332
mxpv merged 3 commits intocontainerd:release/1.7from
fuweid:cp-17-9555

Conversation

@fuweid
Copy link
Member

@fuweid fuweid commented Jun 13, 2024

@fuweid fuweid changed the title [release/1.7] *: export RemoveVolatileOption for CRI image volumes [release/1.7] Remove overlayfs volatile option on temp mounts Jun 13, 2024
KodieGlosserIBM and others added 3 commits June 13, 2024 15:39
Signed-off-by: krglosse <[email protected]>

do not alter original slice

Signed-off-by: krglosse <[email protected]>

Update core/mount/temp.go

makes sense, thank you!

Co-authored-by: Derek McGowan <[email protected]>
Signed-off-by: KodieGlosserIBM <[email protected]>

do not copy mount structure unless conditional is met and adding a test case for it

Signed-off-by: krglosse <[email protected]>

copy option slice when removing the element instead of giving the element an empty string

remove unneeded block

Signed-off-by: krglosse <[email protected]>

simplify

Signed-off-by: krglosse <[email protected]>
(cherry picked from commit cfe8321)
Signed-off-by: Wei Fu <[email protected]>
Remove volatile option when CRI prepares image volumes.

Signed-off-by: Wei Fu <[email protected]>
(cherry picked from commit 4123170)
Signed-off-by: Wei Fu <[email protected]>
@fuweid
Copy link
Member Author

fuweid commented Jun 13, 2024

/retest

@mxpv mxpv merged commit 0a9ac76 into containerd:release/1.7 Jun 14, 2024
@fuweid fuweid deleted the cp-17-9555 branch June 17, 2024 04:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants