-
Notifications
You must be signed in to change notification settings - Fork 380
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
Merge release branch into main
#2070
Merge release branch into main
#2070
Conversation
As the title says [NO NEW TESTS NEEDED] Signed-off-by: Tom Sweeney <[email protected]>
As the title says [NO NEW TESTS NEEDED] Signed-off-by: Tom Sweeney <[email protected]>
As the title says [NO NEW TESTS NEEDED] Signed-off-by: Tom Sweeney <[email protected]>
…/storage1.48 [release-5.26] c/storage to 1.48, bump c/image to v5.26.1, and then to v5.26.2-dev
293a776
to
293849a
Compare
The GitHub view is not helpful here - see this in |
293849a
to
02396c8
Compare
Marking as draft — we’ll tag a 5.27.0, so let’s do that afterwards. |
Starting a release-5.27 branch. Signed-off-by: Miloslav Trmač <[email protected]>
Skopeo has updated golang.org/x/exp to an API-incompatible version, so test this stable branch against a corresponding Skopeo stable branch. Signed-off-by: Miloslav Trmač <[email protected]>
[release-5.27] Test the release-5.27 branch against the 1.13 branch of Skopeo
`c/image` uses `Instance(` API to get the required details of an instance while performing replication `Platform` of instance is needed hence `ListUpdate` must include platform. Needed by: containers#1987 Signed-off-by: Aditya R <[email protected]>
TryReusingBlob now contains a new option `RequiredCompression` which filters the blob by checking against a compression of the blob which is considerd to be resued, in case `RequiredCompression` is set and `info` of the blob being reused does not matches, no blob is returned. Signed-off-by: Aditya R <[email protected]>
Fixes: containers#2023 (comment). `assert.Equal` expects `assert.Equal(t, expected, actual)` instead of `assert.Equal(t, actual, expected)`. Ref:https://pkg.go.dev/github.com/stretchr/testify/assert#Assertions.Equal Signed-off-by: Aditya R <[email protected]>
Setting SystemContext.ArchitectureChoice to "" does not mean "match any/the first platform"; it's the default behavior of SystemContext, and it means "choose for the current runtime architecture". (Originally discussed in containers#1789 (comment) ) I.e. on amd64 these two test cases are redundant with the first two instances above, and on other architectures (notably ARM) they cause failures. So just drop them. Signed-off-by: Miloslav Trmač <[email protected]>
…gorithmNames There is a need to read annotations of a particular instance to get its compression. Expose `Annotations` as a read-only field. Needed By: containers#1987 Signed-off-by: Aditya R <[email protected]>
- Generally I discourage unsing named return values, it's easy to miss that it wasn't set - I have no idea what the "in the middle of a multi-streamed copy" paragraph refers to. Signed-off-by: Miloslav Trmač <[email protected]>
... so that we don't have to carry it around in extra parameters. Migrating individual functions will follow. Signed-off-by: Miloslav Trmač <[email protected]>
Signed-off-by: Miloslav Trmač <[email protected]>
Signed-off-by: Miloslav Trmač <[email protected]>
... so that we can eliminate three parameters. Signed-off-by: Miloslav Trmač <[email protected]>
Signed-off-by: Miloslav Trmač <[email protected]>
Signed-off-by: Miloslav Trmač <[email protected]>
... so that the code looks the same here and in possible callees. Signed-off-by: Miloslav Trmač <[email protected]>
Use options.Progress and ProgressInterval directly. Signed-off-by: Miloslav Trmač <[email protected]>
Use c.options.OciDecryptConfig directly. Signed-off-by: Miloslav Trmač <[email protected]>
Use c.options.OciEncryptConfig directly. Signed-off-by: Miloslav Trmač <[email protected]>
EnsureCompressionVariantsExist is only valid when working with a manifest list. Signed-off-by: Aditya R <[email protected]>
When copying multiple images i.e `instanceCopyClone` and no image exists in registry in such case if clones are prepared and copied first then original copies will reuse blobs from the clone which is unexpected since argument `requireCompressionFormatMatch` is by default false for `instanceCopyCopy` case. Problem described in following PR is easily reproduceable when working with tools such as buildah, because without this PR buildah will push `clones` first instead of originals and later on `originals` will reuse blobs from `clones`. Signed-off-by: Aditya R <[email protected]>
Signed-off-by: Aditya R <[email protected]> Signed-off-by: Miloslav Trmač <[email protected]>
Signed-off-by: Miloslav Trmač <[email protected]>
Signed-off-by: Miloslav Trmač <[email protected]>
[release-5.27] Preparing 5.27 backport
Signed-off-by: Miloslav Trmač <[email protected]>
02396c8
to
5561997
Compare
Updated to merge the just-released Also bumps the version to |
5561997
to
1507640
Compare
[release-5.27] Fix the branch we use for determining a git-validation starting point
6a88503
to
1ad8120
Compare
1ad8120
to
04232f1
Compare
@vrothberg / @flouthoc PTAL, this should allow vendoring a recent commit of c/image from |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
I wonder if there isn't a switch in GitHub to avoid the bots from downgrading? I saw a "mark as latest release" button or something similar a while ago but did not research what it does. |
That would be a Renovate switch. There’s some history and complexity to that ( e.g. containers/automation#134 , containers/automation#149 ), I don’t know all the details. Fundamentally the issue is that when Git history diverges (e.g. when tagging a release on a branch), commits on the divergent branches are, from Go’s point of view at least, unordered in the “more recent” order (i.e. it is a partial order only). I think preferring a last tagged release to a commit is a pretty reasonable behavior (it only shows up for users who vendor by commit; more removed users who just use published releases never see this). And then, adding a merge like this in Git to add an “ordering edge” in the object graph is, to me, a fairly logical outcome of the versioning framework as it exists — although it is not immediately intuitive. |
> go get github.com/containers/image/v5@main > make vendor This moves c/image to a commit that includes both the work on main that we were already vendoring, and the last tagged version 5.27.0. That should prevent Renovate from proposing downgrades which fail tests: - containers#2065 - containers#2066 Signed-off-by: Miloslav Trmač <[email protected]>
Update c/image after containers/image#2070
Bumping skopeo to version v1.14.0-10-ga85eaac9, which comprises the following commits: 48d11dac fix(deps): update golang.org/x/exp digest to 6522937 87eef310 DOCS: add Gentoo in install.md f50dc204 DOCS: Update to add Arch Linux in install.md 9f52e728 fix(deps): update module golang.org/x/term to v0.15.0 efd76e74 Bump to v1.14.1-dev 6abf96bb Bump to v1.14.0 14496ba4 fix(deps): update module github.com/containers/common to v0.57.0 fa85e47b chore(deps): update dependency containers/automation_images to v20231116 e4b67e78 fix(deps): update module github.com/containers/image/v5 to v5.29.0 edefdb66 Add documentation and smoke tests for the new --compat-auth-file options 518181e5 Update c/image and c/common to latest 56b96a4d fix(deps): update module github.com/containers/storage to v1.51.0 a8e7d94e fix(deps): update module golang.org/x/term to v0.14.0 50cffa38 fix(deps): update module github.com/spf13/cobra to v1.8.0 0c2cca96 [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.2 6b2a26f1 [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.1 6ef8acff fix(deps): update github.com/containers/common digest to 3e5caa0 5d4e89cc chore(deps): update module google.golang.org/grpc to v1.57.1 [security] 5307dd66 fix(deps): update module github.com/containers/ocicrypt to v1.1.9 03c94252 Update github.com/klauspost/compress to v1.17.2 91611a3a chore(deps): update module github.com/docker/docker to v24.0.7+incompatible [security] a9c7c505 Fix ENTRYPOINT documentation, drop others. 70551db8 Remove unused environment variables in Cirrus a2eb508b [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.0 1fa360a6 chore(deps): update dependency containers/automation_images to v20231004 fa3e62f2 chore(deps): update module golang.org/x/net to v0.17.0 [security] dc4fa672 copy: Note support for `zstd:chunked` 538dd6f3 fix(deps): update module golang.org/x/term to v0.13.0 611db7c3 fix(deps): update module github.com/docker/distribution to v2.8.3+incompatible 43e1a96e fix(deps): update github.com/containers/common digest to 745eaa4 5fad766c Packit: switch to @containers/packit-build team for copr failure notification comments d8b3a17f Packit: tag @lsm5 on copr build failures 57034826 vendor of containers/common 7db8fbde fix(deps): update module github.com/opencontainers/image-spec to v1.1.0-rc5 4d921585 fix(deps): update module github.com/containers/common to v0.56.0 9e89e18f Cirrus: Remove multi-arch skopeo image builds 32c8a05a fix(deps): update module github.com/containers/image/v5 to v5.28.0 679615f5 Increase the golangci-lint timeout c1e7c974 fix(deps): update module github.com/containers/storage to v1.50.2 9563e3b8 fix(deps): update module github.com/containers/storage to v1.50.1 427e58f5 fix(deps): update golang.org/x/exp digest to 9212866 7c39f363 Fix a man page link 897619f6 fix(deps): update github.com/containers/image/v5 digest to 58d5eb6 2976f4f8 GHA: Closed issue/PR comment-lock test 46979914 fix(deps): update module github.com/containers/common to v0.55.4 3249973d fix(deps): update module github.com/containers/storage to v1.49.0 b87a1b3e rpm: spdx compatible license field b0d587a9 chore(deps): update dependency golangci/golangci-lint to v1.54.2 7ced0fb0 chore(deps): update dependency containers/automation_images to v20230816 4b952d61 Packit: set eln target correctly 6b827fa7 packit: Build PRs into default packit COPRs fec950c2 DOCS: Update Go version requirement info 449ac9bb DOCS: Add information about the cross-build 78187ca8 fix(deps): update module github.com/containers/ocicrypt to v1.1.8 df117e28 fix(deps): update module github.com/containers/common to v0.55.3 4ee2946b Update c/image after containers/image#2070 0e3efc64 chore(deps): update dependency golangci/golangci-lint to v1.54.1 46fcbd3a chore(deps): update dependency containers/automation_images to v20230809 e98561e2 fix(deps): update golang.org/x/exp digest to 352e893 4f5ba65a chore(deps): update dependency containers/automation_images to v20230807 5abce03c Update to Go 1.19 276b8095 fix(deps): update module golang.org/x/term to v0.11.0 60ee543f Update c/image for golang.org/x/exp ab892075 RPM: define gobuild macro for rhel/centos stream f236b5ef Fix handling the unexpected return value combination from IsRunningImageAllowed c40f1485 Close the PolicyContext, as required by the API e90ad861 Use globalOptions.getPolicyContext instead of an image-targeted SystemContext a4aa15f4 Packit: remove pre-sync action a0a340a1 fix(deps): update module github.com/containers/common to v0.55.2 f7dc0847 proxy: Change the imgid to uint64 a39972ca [CI:BUILD] Packit: install golist before updating downstream spec 2945e9e0 Update module golang.org/x/term to v0.10.0 5f87f6ab Bump to v1.14.0-dev cb1e9012 Bump to v1.13.0 Signed-off-by: Bruce Ashfield <[email protected]>
Bumping skopeo to version v1.14.0-10-ga85eaac9, which comprises the following commits: 48d11dac fix(deps): update golang.org/x/exp digest to 6522937 87eef310 DOCS: add Gentoo in install.md f50dc204 DOCS: Update to add Arch Linux in install.md 9f52e728 fix(deps): update module golang.org/x/term to v0.15.0 efd76e74 Bump to v1.14.1-dev 6abf96bb Bump to v1.14.0 14496ba4 fix(deps): update module github.com/containers/common to v0.57.0 fa85e47b chore(deps): update dependency containers/automation_images to v20231116 e4b67e78 fix(deps): update module github.com/containers/image/v5 to v5.29.0 edefdb66 Add documentation and smoke tests for the new --compat-auth-file options 518181e5 Update c/image and c/common to latest 56b96a4d fix(deps): update module github.com/containers/storage to v1.51.0 a8e7d94e fix(deps): update module golang.org/x/term to v0.14.0 50cffa38 fix(deps): update module github.com/spf13/cobra to v1.8.0 0c2cca96 [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.2 6b2a26f1 [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.1 6ef8acff fix(deps): update github.com/containers/common digest to 3e5caa0 5d4e89cc chore(deps): update module google.golang.org/grpc to v1.57.1 [security] 5307dd66 fix(deps): update module github.com/containers/ocicrypt to v1.1.9 03c94252 Update github.com/klauspost/compress to v1.17.2 91611a3a chore(deps): update module github.com/docker/docker to v24.0.7+incompatible [security] a9c7c505 Fix ENTRYPOINT documentation, drop others. 70551db8 Remove unused environment variables in Cirrus a2eb508b [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.0 1fa360a6 chore(deps): update dependency containers/automation_images to v20231004 fa3e62f2 chore(deps): update module golang.org/x/net to v0.17.0 [security] dc4fa672 copy: Note support for `zstd:chunked` 538dd6f3 fix(deps): update module golang.org/x/term to v0.13.0 611db7c3 fix(deps): update module github.com/docker/distribution to v2.8.3+incompatible 43e1a96e fix(deps): update github.com/containers/common digest to 745eaa4 5fad766c Packit: switch to @containers/packit-build team for copr failure notification comments d8b3a17f Packit: tag @lsm5 on copr build failures 57034826 vendor of containers/common 7db8fbde fix(deps): update module github.com/opencontainers/image-spec to v1.1.0-rc5 4d921585 fix(deps): update module github.com/containers/common to v0.56.0 9e89e18f Cirrus: Remove multi-arch skopeo image builds 32c8a05a fix(deps): update module github.com/containers/image/v5 to v5.28.0 679615f5 Increase the golangci-lint timeout c1e7c974 fix(deps): update module github.com/containers/storage to v1.50.2 9563e3b8 fix(deps): update module github.com/containers/storage to v1.50.1 427e58f5 fix(deps): update golang.org/x/exp digest to 9212866 7c39f363 Fix a man page link 897619f6 fix(deps): update github.com/containers/image/v5 digest to 58d5eb6 2976f4f8 GHA: Closed issue/PR comment-lock test 46979914 fix(deps): update module github.com/containers/common to v0.55.4 3249973d fix(deps): update module github.com/containers/storage to v1.49.0 b87a1b3e rpm: spdx compatible license field b0d587a9 chore(deps): update dependency golangci/golangci-lint to v1.54.2 7ced0fb0 chore(deps): update dependency containers/automation_images to v20230816 4b952d61 Packit: set eln target correctly 6b827fa7 packit: Build PRs into default packit COPRs fec950c2 DOCS: Update Go version requirement info 449ac9bb DOCS: Add information about the cross-build 78187ca8 fix(deps): update module github.com/containers/ocicrypt to v1.1.8 df117e28 fix(deps): update module github.com/containers/common to v0.55.3 4ee2946b Update c/image after containers/image#2070 0e3efc64 chore(deps): update dependency golangci/golangci-lint to v1.54.1 46fcbd3a chore(deps): update dependency containers/automation_images to v20230809 e98561e2 fix(deps): update golang.org/x/exp digest to 352e893 4f5ba65a chore(deps): update dependency containers/automation_images to v20230807 5abce03c Update to Go 1.19 276b8095 fix(deps): update module golang.org/x/term to v0.11.0 60ee543f Update c/image for golang.org/x/exp ab892075 RPM: define gobuild macro for rhel/centos stream f236b5ef Fix handling the unexpected return value combination from IsRunningImageAllowed c40f1485 Close the PolicyContext, as required by the API e90ad861 Use globalOptions.getPolicyContext instead of an image-targeted SystemContext a4aa15f4 Packit: remove pre-sync action a0a340a1 fix(deps): update module github.com/containers/common to v0.55.2 f7dc0847 proxy: Change the imgid to uint64 a39972ca [CI:BUILD] Packit: install golist before updating downstream spec 2945e9e0 Update module golang.org/x/term to v0.10.0 5f87f6ab Bump to v1.14.0-dev cb1e9012 Bump to v1.13.0 Signed-off-by: Bruce Ashfield <[email protected]>
Bumping skopeo to version v1.14.0-10-ga85eaac9, which comprises the following commits: 48d11dac fix(deps): update golang.org/x/exp digest to 6522937 87eef310 DOCS: add Gentoo in install.md f50dc204 DOCS: Update to add Arch Linux in install.md 9f52e728 fix(deps): update module golang.org/x/term to v0.15.0 efd76e74 Bump to v1.14.1-dev 6abf96bb Bump to v1.14.0 14496ba4 fix(deps): update module github.com/containers/common to v0.57.0 fa85e47b chore(deps): update dependency containers/automation_images to v20231116 e4b67e78 fix(deps): update module github.com/containers/image/v5 to v5.29.0 edefdb66 Add documentation and smoke tests for the new --compat-auth-file options 518181e5 Update c/image and c/common to latest 56b96a4d fix(deps): update module github.com/containers/storage to v1.51.0 a8e7d94e fix(deps): update module golang.org/x/term to v0.14.0 50cffa38 fix(deps): update module github.com/spf13/cobra to v1.8.0 0c2cca96 [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.2 6b2a26f1 [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.1 6ef8acff fix(deps): update github.com/containers/common digest to 3e5caa0 5d4e89cc chore(deps): update module google.golang.org/grpc to v1.57.1 [security] 5307dd66 fix(deps): update module github.com/containers/ocicrypt to v1.1.9 03c94252 Update github.com/klauspost/compress to v1.17.2 91611a3a chore(deps): update module github.com/docker/docker to v24.0.7+incompatible [security] a9c7c505 Fix ENTRYPOINT documentation, drop others. 70551db8 Remove unused environment variables in Cirrus a2eb508b [CI:DOCS] Update dependency golangci/golangci-lint to v1.55.0 1fa360a6 chore(deps): update dependency containers/automation_images to v20231004 fa3e62f2 chore(deps): update module golang.org/x/net to v0.17.0 [security] dc4fa672 copy: Note support for `zstd:chunked` 538dd6f3 fix(deps): update module golang.org/x/term to v0.13.0 611db7c3 fix(deps): update module github.com/docker/distribution to v2.8.3+incompatible 43e1a96e fix(deps): update github.com/containers/common digest to 745eaa4 5fad766c Packit: switch to @containers/packit-build team for copr failure notification comments d8b3a17f Packit: tag @lsm5 on copr build failures 57034826 vendor of containers/common 7db8fbde fix(deps): update module github.com/opencontainers/image-spec to v1.1.0-rc5 4d921585 fix(deps): update module github.com/containers/common to v0.56.0 9e89e18f Cirrus: Remove multi-arch skopeo image builds 32c8a05a fix(deps): update module github.com/containers/image/v5 to v5.28.0 679615f5 Increase the golangci-lint timeout c1e7c974 fix(deps): update module github.com/containers/storage to v1.50.2 9563e3b8 fix(deps): update module github.com/containers/storage to v1.50.1 427e58f5 fix(deps): update golang.org/x/exp digest to 9212866 7c39f363 Fix a man page link 897619f6 fix(deps): update github.com/containers/image/v5 digest to 58d5eb6 2976f4f8 GHA: Closed issue/PR comment-lock test 46979914 fix(deps): update module github.com/containers/common to v0.55.4 3249973d fix(deps): update module github.com/containers/storage to v1.49.0 b87a1b3e rpm: spdx compatible license field b0d587a9 chore(deps): update dependency golangci/golangci-lint to v1.54.2 7ced0fb0 chore(deps): update dependency containers/automation_images to v20230816 4b952d61 Packit: set eln target correctly 6b827fa7 packit: Build PRs into default packit COPRs fec950c2 DOCS: Update Go version requirement info 449ac9bb DOCS: Add information about the cross-build 78187ca8 fix(deps): update module github.com/containers/ocicrypt to v1.1.8 df117e28 fix(deps): update module github.com/containers/common to v0.55.3 4ee2946b Update c/image after containers/image#2070 0e3efc64 chore(deps): update dependency golangci/golangci-lint to v1.54.1 46fcbd3a chore(deps): update dependency containers/automation_images to v20230809 e98561e2 fix(deps): update golang.org/x/exp digest to 352e893 4f5ba65a chore(deps): update dependency containers/automation_images to v20230807 5abce03c Update to Go 1.19 276b8095 fix(deps): update module golang.org/x/term to v0.11.0 60ee543f Update c/image for golang.org/x/exp ab892075 RPM: define gobuild macro for rhel/centos stream f236b5ef Fix handling the unexpected return value combination from IsRunningImageAllowed c40f1485 Close the PolicyContext, as required by the API e90ad861 Use globalOptions.getPolicyContext instead of an image-targeted SystemContext a4aa15f4 Packit: remove pre-sync action a0a340a1 fix(deps): update module github.com/containers/common to v0.55.2 f7dc0847 proxy: Change the imgid to uint64 a39972ca [CI:BUILD] Packit: install golist before updating downstream spec 2945e9e0 Update module golang.org/x/term to v0.10.0 5f87f6ab Bump to v1.14.0-dev cb1e9012 Bump to v1.13.0 Signed-off-by: Bruce Ashfield <[email protected]>
The last tagged release,
v5.26.1
, is on a branch; users of c/image who refer to a post-release commit frommain
see Renovate try to downgrade, e.g. containers/skopeo#2066 , and that breaks.To help with that situation, merge the release branch into
main
, so that the later commits are recognized by Go as successors to the tagged release. Note that for this to make a difference, the users of c/image need to update their reference to include at least the merge commit from this PR.Compare #1861 and related PRs from that time.