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

Backports and release notes for v3.4.0-RC1 #11598

Merged
merged 31 commits into from
Sep 16, 2021

Conversation

mheon
Copy link
Member

@mheon mheon commented Sep 15, 2021

As the title says.

Let's hope CI is happy.

@mheon mheon changed the base branch from main to v3.4 September 15, 2021 19:54
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 15, 2021
RELEASE_NOTES.md Outdated Show resolved Hide resolved
@mheon
Copy link
Member Author

mheon commented Sep 15, 2021

@baude @TomSweeneyRedHat PTAL at the release notes please

@mheon mheon force-pushed the 34_backportsreleasenotes branch from cbca151 to fa95b3f Compare September 16, 2021 13:21
@mheon
Copy link
Member Author

mheon commented Sep 16, 2021

The build each commit job appears to be busted, it's building commits from last year.

mheon and others added 17 commits September 16, 2021 09:42
These are not presently functional - we need a rewrite of how the
pod cgroup is handled first.

Signed-off-by: Matthew Heon <[email protected]>
Signed-off-by: Paul Holzinger <[email protected]>
When using the defaut conection for podman machine ssh, use the default
username too.

Signed-off-by: Ashley Cui <[email protected]>
Closes containers#11531

[NO TESTS NEEDED]

Signed-off-by: Hyeon Kim <[email protected]>
and fix it for running with runc.

Closes: containers#11165

Signed-off-by: Giuseppe Scrivano <[email protected]>
When we restart a container via podman restart or restart policy the
rootlessport process fails with `address already in use` because the
socketfile still exists.
This is a regression and was introduced in commit abdedc3.

Signed-off-by: Paul Holzinger <[email protected]>
When a container is automatically restarted due its restart policy and
the container uses rootless cni networking with ports forwarded we have
to start a new rootlessport process since it exits with conmon.

Signed-off-by: Paul Holzinger <[email protected]>
For rootful users ports are forwarded via iptables. To make sure no
other process tries to use them, libpod will bind the ports and pass the
fds to conmon. There seems to be race when a container is restarted
because libpod tries to bind the port before the conmon process exited.

The problem only hapens with the podman service because it keeps the
connection open. Once we have the fd and passed it to conmon the
podman service should close the connection.

To verify run `sudo ss -tulpn` and check that only the conmon process
keeps the port open. Previously you would also see the podman server
process listed.

Signed-off-by: Paul Holzinger <[email protected]>
* Follow https://pkg.go.dev/cmd/go#hdr-Generate_Go_files_by_processing_source
  for leading comment
* Add godoc strings for all exposed methods for IDE support
* Copy field godoc strings into generated code as function godoc string
* Remove unused/unnecessary fields from generator.go structures
* Cleanup code regarding template usage

Signed-off-by: Jhon Honce <[email protected]>
read the cgroup directly from the container.

Signed-off-by: Giuseppe Scrivano <[email protected]>
@mheon
Copy link
Member Author

mheon commented Sep 16, 2021

Build each commit now complaining about a commit that doesn't exist in the tree...

@mheon mheon force-pushed the 34_backportsreleasenotes branch from fa95b3f to 0a6ab91 Compare September 16, 2021 13:43
@mheon
Copy link
Member Author

mheon commented Sep 16, 2021

@cevich PTAL

@edsantiago
Copy link
Member

I can reproduce the build-each-commit error on my laptop. It looks like fb564d8 is broken, with the fix coming in 3 or so commits later (sorry, git rebase -x doesn't show me the SHA that fixes it.

@mheon
Copy link
Member Author

mheon commented Sep 16, 2021

So it's just reporting the wrong commit hashes? Lovely...

jelly and others added 2 commits September 16, 2021 11:00
When `?all=garbage` is passed to an API endpoint schema validation fails
and err is nil. Wrapf uses err to create an error message causing a nil
pointer dereference.

Signed-off-by: Jelle van der Waa <[email protected]>
Along with the name (id) and the version(_id)

But only show the information if is available

Examples: Fedora CoreOS, Ubuntu Focal

[NO TESTS NEEDED]

Signed-off-by: Anders F Björklund <[email protected]>
mheon and others added 10 commits September 16, 2021 11:00
Signed-off-by: Matthew Heon <[email protected]>
Signed-off-by: Matthew Heon <[email protected]>
Following commit makes sure that podman mirrors --authfile to a temporary
file in filesystem if arg is pointing to an FD instead of actual file
as FD can be only consumed once.

Reference:
* containers/buildah#3498
* containers/buildah#3070

[NO TESTS NEEDED]

Signed-off-by: Aditya Rajan <[email protected]>
Fix copy tests after containers/buildah#3486

[NO TESTS NEEDED]

Signed-off-by: Aditya Rajan <[email protected]>
The builder can take a list of platforms in the Platforms field of its
BuildOptions argument, and we should definitely take advantage of that.

The `bud-multiple-platform-values` test from buildah exercises support
for this, so
[NO TESTS NEEDED]

Signed-off-by: Nalin Dahyabhai <[email protected]>
Honor --cgroups=split also when the container is running in a pod.

Signed-off-by: Giuseppe Scrivano <[email protected]>
Signed-off-by: Matthew Heon <[email protected]>
Signed-off-by: Matthew Heon <[email protected]>
@mheon mheon force-pushed the 34_backportsreleasenotes branch from 0a6ab91 to a647e1d Compare September 16, 2021 15:00
@edsantiago
Copy link
Member

I don't understand your comment. git lp shows 29 commits, and the one I reported is one of those 29.

@Luap99
Copy link
Member

Luap99 commented Sep 16, 2021

It looks like you are missing the --ssh option in the podman build page. https://github.com/containers/podman/blob/main/docs/source/markdown/podman-build.1.md#--sshdefaultidsocket

@mheon
Copy link
Member Author

mheon commented Sep 16, 2021

@edsantiago Cirrus' build-each-commit job was giving me SHAs that don't exist in the tree - so perhaps it works locally, but it decidedly does not on upstream CI.

@mheon
Copy link
Member Author

mheon commented Sep 16, 2021

I think CI is starting to pass.

@cevich
Copy link
Member

cevich commented Sep 16, 2021

The .cirrus.yml changes LGTM

@mheon
Copy link
Member Author

mheon commented Sep 16, 2021

Buildah tests failing - probably need to copy those from main as well.

Copy link
Member

@Luap99 Luap99 left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@lsm5 lsm5 left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Sep 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lsm5, 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

@baude
Copy link
Member

baude commented Sep 16, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 16, 2021
@openshift-merge-robot openshift-merge-robot merged commit 2a30b60 into containers:v3.4 Sep 16, 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 22, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 22, 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.