Merge c/storage v1.57.2 into main
#2276
Conversation
…-bump-1.57 [1.57] Fall back …, bump limit to 150 MB, and tag as 1.57.1
Signed-off-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
…erry-pick-2256-to-release-1.57 [release-1.57] chore(deps): update dependency golangci/golangci-lint to v1.64.5
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>
…erry-pick-2269-to-release-1.57 [release-1.57] idmap: force PRIVATE propagation
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>
Makefile
Outdated
| @@ -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.64.6 | |||
| GOLANGCI_LINT_VERSION := 1.64.5 | |||
There was a problem hiding this comment.
This doesn't look right, the linter is being downgraded?
There was a problem hiding this comment.
oops, thanks for catching that.
|
This PR ends up with nothing changed? |
|
Which is exactly the point. This should not change anything on main but we need to merge the branches to make go tooling able to figure out which commit/tag is newer so we can vendor things properly during the development cycles. i.e. #2255 containers/image#2755 The alternative is that we must vendor image to a c/storage commit on main than c/common, buildah and only then we can vendor the latest in podman. As long as any dependency says storage 1.57.2 the go tooling would think it is newer than main and thus "upgrade" while actually downgrading the underlying code. And then renovate thinks each new tag is a upgrade and opens PRs, with the merged tag/ release branch that does not happen. |
|
/lgtm |
|
/approve |
|
[APPROVALNOTIFIER] This PR is APPROVED Approval requirements bypassed by manually added approval. This pull-request has been approved by: giuseppe, Luap99, mtrmac The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
... so that the referenced version is larger than 1.57.2 required by Skopeo, and we don't downgrade and lose a required API. Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Update c/storage after containers/storage#2276
… to let Go understand the relationship.
Cc: @TomSweeneyRedHat @Luap99