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

Use the InfraImage defined in containers.conf #12780

Merged
merged 1 commit into from
Jan 10, 2022

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jan 9, 2022

Remove hard code use of the DefaultInfraImage and rely on
getting this from containers.conf.

Fixes: #12771

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 9, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

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 Jan 9, 2022
podGen.InfraImage = imageName
podGen.InfraContainerSpec = specgen.NewSpecGenerator(imageName, false)
podGen.InfraContainerSpec.RawImageName = imageName
podGen.InfraContainerSpec = specgen.NewSpecGenerator("", false)
Copy link
Contributor

Choose a reason for hiding this comment

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

will this populate the image name in the spec before passing it to the remote client if that path is called? Looking at NewSpecGenerator it looks like it will just pass the empty string

Copy link
Member Author

@rhatdan rhatdan Jan 10, 2022

Choose a reason for hiding this comment

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

Yes it should be empty string, and allow the server side to decide, based on the contents of containers.conf.

@mheon
Copy link
Member

mheon commented Jan 10, 2022

LGTM once you can tame the tests

Remove hard code use of the DefaultInfraImage and rely on
getting this from containers.conf.

Fixes: containers#12771

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@TomSweeneyRedHat
Copy link
Member

LGTM
and happy tests, merging.

@TomSweeneyRedHat
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 10, 2022
@openshift-merge-robot openshift-merge-robot merged commit ed9ef59 into containers:main Jan 10, 2022
@TomSweeneyRedHat
Copy link
Member

@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 21, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 21, 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.

podman pod create command ignored the default pod infra image specified in containers.conf
5 participants