Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: containers/storage
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.57.1
Choose a base ref
...
head repository: containers/storage
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.57.2
Choose a head ref
  • 6 commits
  • 3 files changed
  • 4 contributors

Commits on Jan 30, 2025

  1. Merge pull request #2241 from mtrmac/chunked-too-large-with-bump-1.57

    [1.57] Fall back …, bump limit to 150 MB, and tag as 1.57.1
    openshift-merge-bot[bot] authored Jan 30, 2025
    Copy the full SHA
    f4d2e9c View commit details

Commits on Mar 6, 2025

  1. chore(deps): update dependency golangci/golangci-lint to v1.64.5

    Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    renovate[bot] authored and openshift-cherrypick-robot committed Mar 6, 2025
    Copy the full SHA
    ff009f0 View commit details
  2. Merge pull request #2274 from openshift-cherrypick-robot/cherry-pick-…

    …2256-to-release-1.57
    
    [release-1.57] chore(deps): update dependency golangci/golangci-lint to v1.64.5
    openshift-merge-bot[bot] authored Mar 6, 2025
    Copy the full SHA
    2dcbde6 View commit details
  3. idmap: force PRIVATE propagation

    do not leak idmapped mounts to other namespaces, since they are meant
    to be used privately by overlay.
    
    This is already done with the default configuration, since we have a
    private mount on top of the graphdriver directory, but it is not the
    case when `skip_home_mount` is used.
    
    Closes: https://issues.redhat.com/browse/OCPBUGS-49927
    
    Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
    giuseppe committed Mar 6, 2025
    Copy the full SHA
    22b679b View commit details
  4. Merge pull request #2272 from openshift-cherrypick-robot/cherry-pick-…

    …2269-to-release-1.57
    
    [release-1.57] idmap: force PRIVATE propagation
    openshift-merge-bot[bot] authored Mar 6, 2025
    Copy the full SHA
    e0f1f0c View commit details
  5. [release-1.57] Bump to c/storage v1.57.2

    Bump to cstorage v1.57.2.
    This is the first of several vendor dance steps to
    satisfy https://issues.redhat.com/browse/RHEL-82509 and
    https://issues.redhat.com/browse/RHEL-82511
    
    Signed-off-by: tomsweeneyredhat <tsweeney@redhat.com>
    TomSweeneyRedHat committed Mar 6, 2025
    Copy the full SHA
    0dda9c2 View commit details
Showing with 5 additions and 4 deletions.
  1. +1 −1 Makefile
  2. +1 −1 VERSION
  3. +3 −2 pkg/idmap/idmapped_utils.go
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -35,7 +35,7 @@ TESTFLAGS := $(shell $(GO) test -race $(BUILDFLAGS) ./pkg/stringutils 2>&1 > /de
# N/B: This value is managed by Renovate, manual changes are
# possible, as long as they don't disturb the formatting
# (i.e. DO NOT ADD A 'v' prefix!)
GOLANGCI_LINT_VERSION := 1.63.4
GOLANGCI_LINT_VERSION := 1.64.5

default all: local-binary docs local-validate local-cross ## validate all checks, build and cross-build\nbinaries and docs

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.57.1
1.57.2
5 changes: 3 additions & 2 deletions pkg/idmap/idmapped_utils.go
Original file line number Diff line number Diff line change
@@ -33,8 +33,9 @@ func CreateIDMappedMount(source, target string, pid int) error {

if err := unix.MountSetattr(targetDirFd, "", unix.AT_EMPTY_PATH|unix.AT_RECURSIVE,
&unix.MountAttr{
Attr_set: unix.MOUNT_ATTR_IDMAP,
Userns_fd: uint64(userNsFile.Fd()),
Attr_set: unix.MOUNT_ATTR_IDMAP,
Userns_fd: uint64(userNsFile.Fd()),
Propagation: unix.MS_PRIVATE,
}); err != nil {
return &os.PathError{Op: "mount_setattr", Path: source, Err: err}
}