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

pod create: read infra image from containers.conf #12250

Merged
merged 1 commit into from
Nov 10, 2021
Merged

pod create: read infra image from containers.conf #12250

merged 1 commit into from
Nov 10, 2021

Conversation

vrothberg
Copy link
Member

Fix a bug where pods would be created with the hard-coded default infra
image instead of the custom one from containers.conf. Add a simple
regression test.

Fixes: #12245
Signed-off-by: Valentin Rothberg rothberg@redhat.com

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 10, 2021
@vrothberg
Copy link
Member Author

@mheon, possibly a candidate for 3.4.

@vrothberg
Copy link
Member Author

Closing in favor of #12249.

@vrothberg vrothberg closed this Nov 10, 2021
@giuseppe giuseppe reopened this Nov 10, 2021
giuseppe
giuseppe reviewed Nov 10, 2021
View reviewed changes
Copy link
Member

@giuseppe giuseppe left a comment

Choose a reason for hiding this comment

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

LGTM

This was referenced Nov 10, 2021
Closed
Closed
@vrothberg
pod create: read infra image from containers.conf
df06664 
Fix a bug where pods would be created with the hard-coded default infra
image instead of the custom one from containers.conf.  Add a simple
regression test.

Fixes: containers#12245
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
@vrothberg
Copy link
Member Author

had to repush to restart the CI jobs

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Nov 10, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: flouthoc, vrothberg

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

@edsantiago
Copy link
Member

Have you tested this with podman play kube? I'm seeing a weird issue in the tests, wherein the 700-play.bats test pulls in both podman-pause and k8s.io/pause. Will investigate further but wanted to mention it.

@vrothberg
Copy link
Member Author

Have you tested this with podman play kube? I'm seeing a weird issue in the tests, wherein the 700-play.bats test pulls in both podman-pause and k8s.io/pause. Will investigate further but wanted to mention it.

Thanks for catching it. I will have a look. Probably the same/similar issue with using the hard-coded default instead of what containers.conf wants.

@vrothberg
Copy link
Member Author

@containers/podman-maintainers PTAL

@mheon
Copy link
Member

mheon commented Nov 10, 2021

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 10, 2021
@openshift-merge-robot openshift-merge-robot merged commit 93df757 into containers:main Nov 10, 2021
@vrothberg vrothberg deleted the fix-12245 branch November 10, 2021 14:42
This was referenced Nov 10, 2021
Closed
Closed
Closed
@edsantiago edsantiago mentioned this pull request Nov 30, 2021
Closed
@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.
Reviewers

@giuseppe giuseppe giuseppe left review comments

@flouthoc flouthoc flouthoc approved these changes

Assignees

@mheon mheon

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.

containers.conf -> infra_image doesn't work
6 participants
@vrothberg @edsantiago @mheon @giuseppe @flouthoc @openshift-merge-robot