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

refactor libpod config into libpod/config #4352

Merged
merged 1 commit into from
Oct 31, 2019
Merged

refactor libpod config into libpod/config #4352

merged 1 commit into from
Oct 31, 2019

Conversation

vrothberg
Copy link
Member

No description provided.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 28, 2019
@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 28, 2019
@vrothberg vrothberg mentioned this pull request Oct 28, 2019
Closed
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 28, 2019
@baude
Copy link
Member

baude commented Oct 28, 2019

code lgtm to me .. lets get the tests passing.

@vrothberg
Copy link
Member Author

code lgtm to me .. lets get the tests passing.

Found the needle in the haystack. The default config must not set the config.StorageConfig, otherwise c/storage won't apply the correct labels to the created directories.

@vrothberg vrothberg changed the title WIP - refactor libpod config into libpod/config refactor libpod config into libpod/config Oct 28, 2019
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 28, 2019
@vrothberg vrothberg force-pushed the config-package branch 3 times, most recently from b2d361f to 7cf44c3 Compare October 29, 2019 12:04
@vrothberg vrothberg mentioned this pull request Oct 29, 2019
Merged
@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #3792) made this pull request unmergeable. Please resolve the merge conflicts.

@vrothberg
Copy link
Member Author

Now rebased. Still need to find the regression wrt to the container state.

@vrothberg vrothberg force-pushed the config-package branch 2 times, most recently from 9254de4 to dc7e121 Compare October 30, 2019 13:13
@vrothberg
Copy link
Member Author

vrothberg commented Oct 30, 2019 •
edited
Loading

@baude, note that this PR changes the behavior regarding cgroups v2 and crun (see https://github.com/containers/libpod/pull/4352/files#diff-32cf5e5691a70dd66cc0362db7d6d40cR541). It will auto-set the runtime to crun if running on v2. However, it's guarded by an internal boolean that can be turned on/off a build time.

@vrothberg
Copy link
Member Author

vrothberg commented Oct 30, 2019 •
edited
Loading

@baude @rhatdan ... I can't believe we're (nearly) green. The one failing job is broken due to an old conmon version on the image.

mheon
mheon reviewed Oct 30, 2019
View reviewed changes
libpod/config/config.go Outdated Show resolved Hide resolved
@vrothberg vrothberg force-pushed the config-package branch 2 times, most recently from ededc53 to cb583b1 Compare October 30, 2019 15:43
mheon
mheon reviewed Oct 31, 2019
View reviewed changes
libpod/config/config.go Outdated Show resolved Hide resolved
mheon
mheon reviewed Oct 31, 2019
View reviewed changes
libpod/config/config.go Outdated Show resolved Hide resolved
@vrothberg
add libpod/config
11c282a 
Refactor the `RuntimeConfig` along with related code from libpod into
libpod/config.  Note that this is a first step of consolidating code
into more coherent packages to make the code more maintainable and less
prone to regressions on the long runs.

Some libpod definitions were moved to `libpod/define` to resolve
circular dependencies.

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
@mheon
Copy link
Member

mheon commented Oct 31, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 31, 2019
@openshift-merge-robot openshift-merge-robot merged commit 3e2d9f8 into containers:master Oct 31, 2019
@vrothberg vrothberg deleted the config-package branch November 1, 2019 09:50
This was referenced Nov 4, 2019
Merged
Closed
Closed
@mtrmac mtrmac mentioned this pull request Oct 19, 2022
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 26, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 26, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@mheon mheon mheon left review comments

@rhatdan rhatdan Awaiting requested review from rhatdan

@umohnani8 umohnani8 Awaiting requested review from umohnani8

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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@vrothberg @openshift-ci-robot @baude @rh-atomic-bot @mheon @openshift-merge-robot