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.

Sign up for GitHub

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

Jump to bottom

Bump to v3.2.0 #10552

Merged
merged 7 commits into from
Jun 3, 2021
Merged

Bump to v3.2.0 #10552

merged 7 commits into from
Jun 3, 2021

Conversation

mheon
Copy link
Member

@mheon mheon commented Jun 3, 2021

Two final backports, final release notes update, and version bump.

matejvasek and others added 2 commits June 3, 2021 13:54
@matejvasek @mheon
Use request context instead of background
4b8ca63 
This prevents goroutine leak:
If background context were used then push operation would continue even
if client aborted request by closing connection.

[NO TESTS NEEDED]

Signed-off-by: Matej Vasek <[email protected]>
@Luap99 @mheon
add ipv6 nameservers only when the container has ipv6 enabled
f62c6bf 
The containers /etc/resolv.conf allways preserved the ipv6 nameserves
from the host even when the container did not supported ipv6. Check
if the cni result contains an ipv6 address or slirp4netns has ipv6
support enabled and only add the ipv6 nameservers when this is the case.

The test needs to have an ipv6 nameserver in the hosts /etc/hosts but we
should never mess with this file on the host. Therefore the test is
skipped when no ipv6 is detected.

Fixes containers#10158

Signed-off-by: Paul Holzinger <[email protected]>
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jun 3, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mheon

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 3, 2021
@jwhonce
Copy link
Member

jwhonce commented Jun 3, 2021

LGTM

mheon and others added 4 commits June 3, 2021 14:10
@mheon
Final release notes updates for v3.2.0
8688f54 
Signed-off-by: Matthew Heon <[email protected]>
@mheon
Fix network create macvlan with subnet option
cff7376 
Creating a macvlan network with the subnet or ipRange option should set
the ipam plugin type to `host-local`. We also have to insert the default
route.

Fixes containers#10283

Signed-off-by: Paul Holzinger <[email protected]>
@mheon
Bump to v3.2.0
0281ef2 
Signed-off-by: Matthew Heon <[email protected]>
@mheon
Bump to v3.2.1-dev
72455ec 
Signed-off-by: Matthew Heon <[email protected]>
@Luap99
Copy link
Member

Luap99 commented Jun 3, 2021

/lgtm
/hold

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 3, 2021
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2021
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2021
@mheon
Copy link
Member Author

mheon commented Jun 3, 2021

Had to force-push again to fix release notes.

@mheon
Copy link
Member Author

mheon commented Jun 3, 2021

Also, apparently branch protection isn't set up for this branch yet. Let me fix that.

@edsantiago
Copy link
Member

Needs a tweak here

podman/test/apiv2/01-basic.at

Line 22 in a53251e

.Components[0].Details.MinAPIVersion=3.1.0 \

I thought we had done something in this test to prevent it from failing on each release?

@mheon
Copy link
Member Author

mheon commented Jun 3, 2021

I seem to recall us doing that as well...

@mheon
Copy link
Member Author

mheon commented Jun 3, 2021

Evidently only for API version, not minimum API version.

@mheon
Copy link
Member Author

mheon commented Jun 3, 2021

@containers/podman-maintainers Anyone want to drop an LGTM? Looks like we're going to go green.

@edsantiago
Copy link
Member

/lgtm
/hold

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 3, 2021
@edsantiago
Copy link
Member

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jun 3, 2021
@openshift-merge-robot openshift-merge-robot merged commit c7e96ed into containers:v3.2 Jun 3, 2021
@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 Sep 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers
No reviews
Assignees

@edsantiago edsantiago

@Luap99 Luap99

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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@mheon @jwhonce @Luap99 @edsantiago @openshift-merge-robot @matejvasek