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

Fix use of infra image to clarify default #13064

Merged
merged 1 commit into from
Feb 1, 2022
Merged

Fix use of infra image to clarify default #13064

merged 1 commit into from
Feb 1, 2022

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jan 28, 2022

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

@openshift-ci openshift-ci bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 28, 2022
@rhatdan
Copy link
Member Author

rhatdan commented Jan 28, 2022

Testing: containers/common#910

@rhatdan rhatdan mentioned this pull request Jan 28, 2022
Closed
@vrothberg
Copy link
Member

Note: The consensus on the current behavior was driven by the fact that we'd otherwise keep on pulling the k8s image on existing machines after an update since it was mentioned in containers.conf.

@rhatdan can you extend the docs and mention that users need to comment out the infra_image line in containers.conf if they want to build the local image?

@rhatdan
Copy link
Member Author

rhatdan commented Jan 28, 2022

It is not on by default in the containers.conf. It is commented out. So it will NOT pull the image. Nothing by default is commented out. If the user commented it out, then that indicates that they wanted to pull the image.

@noracenofun noracenofun mentioned this pull request Jan 29, 2022
Closed
@vrothberg
Copy link
Member

Excellent!

@rhatdan
Fix use of infra image to clarify default
6609bb7 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@rhatdan rhatdan changed the title [WIP] Fix use of infra image to clarify default Fix use of infra image to clarify default Jan 31, 2022
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 31, 2022
vrothberg
vrothberg reviewed Feb 1, 2022
View reviewed changes
Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM, nice work @rhatdan !

@containers/podman-maintainers PTAL

giuseppe
giuseppe approved these changes Feb 1, 2022
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

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 1, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, 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-merge-robot openshift-merge-robot merged commit baf0dfc into containers:main Feb 1, 2022
This was referenced Feb 4, 2022
Merged
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 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.
Reviewers

@vrothberg vrothberg vrothberg left review comments

@giuseppe giuseppe giuseppe approved these changes

Assignees

@giuseppe giuseppe

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.
4 participants
@rhatdan @vrothberg @giuseppe @openshift-merge-robot