Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release/0.9] Retain pause.exe as entrypoint for default pause images #1634

Merged
merged 1 commit into from
Feb 1, 2023

Conversation

kiashok
Copy link
Contributor

@kiashok kiashok commented Jan 30, 2023

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

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>
@kiashok kiashok requested a review from a team as a code owner January 30, 2023 17:34
@kiashok kiashok merged commit f985798 into microsoft:release/0.9 Feb 1, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants