Skip to content
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

Bump to v4.6.0 #19077

Merged
merged 10 commits into from
Jul 2, 2023
Merged

Bump to v4.6.0 #19077

merged 10 commits into from
Jul 2, 2023

Conversation

ashley-cui
Copy link
Member

@ashley-cui ashley-cui commented Jun 30, 2023

Vendor dance, a commit that fixes a lint error from the new c/common, release notes, and the version bump.

None

@ashley-cui ashley-cui added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jun 30, 2023
@openshift-ci openshift-ci bot added do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None and removed do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jun 30, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashley-cui

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 30, 2023
@ashley-cui ashley-cui added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. and removed do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. labels Jun 30, 2023
@ashley-cui
Copy link
Member Author

@containers/podman-maintainers PTAL

@openshift-ci openshift-ci bot added do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None release-note-none and removed do-not-merge/release-note-label-needed Enforce release-note requirement, even if just None labels Jun 30, 2023
@TomSweeneyRedHat
Copy link
Member

LGTM once the tests are hip.

@Luap99
Copy link
Member

Luap99 commented Jul 1, 2023

You need to cherry pick test fixes from #18999, sorry should have mentioned that earlier. Also can you cherry pick #19032 as well, I just noticed this is not in the branch but it is in buildah v1.31.0 and we should make sure podman run and podman build behave the same in the same version if we can.

RELEASE_NOTES.md Outdated Show resolved Hide resolved
RELEASE_NOTES.md Outdated Show resolved Hide resolved
RELEASE_NOTES.md Outdated

### API
- Fixed a bug in the compat container create endpoint which could result in a "duplicate mount destination" error when the volume path was not "clean", e.g. included a final slash at the end. ([#18454](https://github.com/containers/podman/issues/18454)).
- The compat API now correctly accpets a tag in the images/create?fromSrc endpoint ([#18597](https://github.com/containers/podman/issues/18597)).
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
- The compat API now correctly accpets a tag in the images/create?fromSrc endpoint ([#18597](https://github.com/containers/podman/issues/18597)).
- The compat API now correctly accepts a tag in the images/create?fromSrc endpoint ([#18597](https://github.com/containers/podman/issues/18597)).

RELEASE_NOTES.md Outdated Show resolved Hide resolved
ashley-cui and others added 5 commits July 1, 2023 14:06
[NO NEW TESTS NEEDED]

Signed-off-by: Ashley Cui <[email protected]>
This commit was automatically cherry-picked
by buildah-vendor-treadmill v0.3
from the buildah vendor treadmill PR, containers#13808

Changes since 2023-05-01:
  - skip a new test, it fails in remote
  - skip encrypted-FROM test, broken by buildah PR 4746

Signed-off-by: Ed Santiago <[email protected]>
Signed-off-by: Paul Holzinger <[email protected]>
After[1] c/image no longer prints "Storing signatures" so we should
not check for it.

[1] containers/image#2001

Signed-off-by: Paul Holzinger <[email protected]>
Luap99 and others added 4 commits July 1, 2023 14:19
Make sure we use the config field to know if we should use pasta or
slirp4netns as default.

While at it fix broken code which sets the default at two different
places, also do not set in Validate() as this should not modify the
specgen IMO, so set it directly before that.

Signed-off-by: Paul Holzinger <[email protected]>
Signed-off-by: Ashley Cui <[email protected]>
Signed-off-by: Ashley Cui <[email protected]>
Signed-off-by: Ashley Cui <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Jul 2, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 2, 2023
@openshift-merge-robot openshift-merge-robot merged commit 3e45317 into containers:v4.6 Jul 2, 2023
@ashley-cui
Copy link
Member Author

FYI: #19091

@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Oct 1, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 1, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. release-note-none
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants