{{ message }}
[release/2.2] Use ScrubLogs by default on Windows - #13882
Merged
samuelkarp merged 2 commits intoAug 6, 2026
Conversation
The io.containerd.runhcs.v1 shim can scrub sensitive information from logs it emits. Since v0.15.0-rc.2 this is done by default, but older branches still require the option to be explicitly enabled. Explicitly enable the scrubbing by default for the CRI configuration. See also: microsoft/hcsshim#2725 Google-Bug-Id: 481375460 Signed-off-by: Samuel Karp <samuelkarp@google.com> (cherry picked from commit f4e7944)
Adds a new --scrub-logs flag to ctr run on Windows. This flag enables the ScrubLogs option for the io.containerd.runhcs.v1 shim. Assisted-by: gemini-cli Signed-off-by: Samuel Karp <samuelkarp@google.com> (cherry picked from commit 18a01c0)
samuelkarp
force-pushed
the
hcsshim-scrub-logs-2.2
branch
from
July 31, 2026 23:22
b46bd80 to
4c93ae6
Compare
AkihiroSuda
approved these changes
Aug 4, 2026
Member
Member
Author
chrishenzie
approved these changes
Aug 6, 2026
github-project-automation
Bot
moved this from Needs Triage
to Review In Progress
in Pull Request Review
github-project-automation
Bot
moved this from Review In Progress
to Done
in Pull Request Review
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
3 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 of #13837