[release/0.9] Retain pause.exe as entrypoint for default pause images#1634
Merged
kiashok merged 1 commit intomicrosoft:release/0.9from Feb 1, 2023
Merged
Conversation
Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com> Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com> Co-authored-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com> (cherry picked from commit 6cd5572) Signed-off-by: Kirtana Ashok <Kirtana.Ashok@microsoft.com>
katiewasnothere
approved these changes
Feb 1, 2023
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
2 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.
This PR ports 6cd5572 from hcsshim/main to release/0.9 branch
Currently, the entrypoint for all pause containers is being overriden to ping.exe immaterial of the pause image used. This is causing perf issues even when the default pause image is used.
This PR retains /pause.exe as entrypoint for the default pause image and overrides to ping.exe only if the default arg/commandline of the non-default pause image being used is "c:\windows\system32\cmd.exe" . We intend to completely get rid of the ping override by containerd/1.7 and hence throw a warning log message to switch to the default pause image asap.
Signed-off-by: Kirtana Ashok Kirtana.Ashok@microsoft.com
Signed-off-by: Kirtana Ashok Kirtana.Ashok@microsoft.com
Co-authored-by: Kirtana Ashok Kirtana.Ashok@microsoft.com
(cherry picked from commit 6cd5572)
Signed-off-by: Kirtana Ashok Kirtana.Ashok@microsoft.com