Merge pull request #125998 from carlory/automated-cherry-pick-of-#125970-upstream-release-1.30

Automated cherry pick of #125970: defaultMaskedPaths must be kept in sync with moby/moby.
This commit is contained in:
Kubernetes Prow Robot 2024-07-11 03:40:15 -07:00 committed by GitHub
commit 40a4bcd1cb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -188,7 +188,7 @@ func AddNoNewPrivileges(sc *v1.SecurityContext) bool {
var (
// These *must* be kept in sync with moby/moby.
// https://github.com/moby/moby/blob/master/oci/defaults.go#L105-L123
// https://github.com/moby/moby/blob/master/oci/defaults.go#L105-L124
// @jessfraz will watch changes to those files upstream.
defaultMaskedPaths = []string{
"/proc/asound",
@ -201,6 +201,7 @@ var (
"/proc/sched_debug",
"/proc/scsi",
"/sys/firmware",
"/sys/devices/virtual/powercap",
}
defaultReadonlyPaths = []string{
"/proc/bus",