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 CONTAINERS_CONF cgroups flag for remote API. #12860

Merged
merged 2 commits into from
Jan 17, 2022

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Jan 14, 2022

No description provided.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jan 14, 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 14, 2022
@rhatdan
Copy link
Member Author

rhatdan commented Jan 14, 2022

Fixed: #12550

@mheon
Copy link
Member

mheon commented Jan 14, 2022

I got a bit worried about the diffstat, but CGroup -> Cgroup makes sense to me

@rhatdan
Copy link
Member Author

rhatdan commented Jan 14, 2022

Yes I went both ways and this seems least breaking.

Also change code to globably be consistent when refering to capatilized
Cgroup.

Fixed: containers#12550

Signed-off-by: Daniel J Walsh <[email protected]>
@rhatdan
Copy link
Member Author

rhatdan commented Jan 14, 2022

@containers/podman-maintainers PTAL

@jwhonce
Copy link
Member

jwhonce commented Jan 14, 2022

LGTM

inspect.WaitWithDefaultTimeout()
Expect(inspect.OutputToString()).To(Not(Equal("disabled")))

os.Setenv("CONTAINERS_CONF", conffile)
Copy link
Member

Choose a reason for hiding this comment

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

Can you unset it in a defer?

Copy link
Member Author

Choose a reason for hiding this comment

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

Not needed in containers_conf_test. The Before/After are taking care of this.

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.

Regarding CGroup vs Cgroup. I'd prefer to call it cgroup in error messages since that's what man pages etc. use. The camel cases in the code LGTM.

@rhatdan rhatdan added the lgtm Indicates that a PR is ready to be merged. label Jan 17, 2022
@openshift-merge-robot openshift-merge-robot merged commit 8514ebd into containers:main Jan 17, 2022
@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.

5 participants