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

Support annotations from containers.conf #9284

Merged
merged 2 commits into from
Feb 9, 2021

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Feb 9, 2021

Currently podman does not use the annotations specified in the
containers.conf. This PR fixes this.

Signed-off-by: Daniel J Walsh [email protected]

@openshift-ci-robot
Copy link
Collaborator

[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-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 9, 2021
@rhatdan
Copy link
Member Author

rhatdan commented Feb 9, 2021

This is important for a blog I am writing on sharing supplemental groups into a container.

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

k := split[0]
v := ""
if len(split) == 2 {
v = split[0]
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
v = split[0]
v = split[1]

wrong index

@mheon
Copy link
Member

mheon commented Feb 9, 2021

Needs fix from @Luap99 then LGTM.

Concerned as to why tests are green despite the logic error.

@rhatdan
Copy link
Member Author

rhatdan commented Feb 9, 2021

The =1 is not important to crun, if crun sees the value, it will allow the supplemental groups in.

@mheon
Copy link
Member

mheon commented Feb 9, 2021

But this isn't the only important annotation that exists, and the test did not catch that the code was incorrect

@rhatdan
Copy link
Member Author

rhatdan commented Feb 9, 2021

Good point now, the test looks for the value 1.

@rhatdan
Copy link
Member Author

rhatdan commented Feb 9, 2021

I also added another PR here to fix a race condition in #9286.
This should help this PR get merged.

@mheon
Copy link
Member

mheon commented Feb 9, 2021

LGTM once things go green

Currently podman does not use the annotations specified in the
containers.conf. This PR fixes this.

Signed-off-by: Daniel J Walsh <[email protected]>
Service needs to be restarted in order to read the CONTAINERS_CONF file.
Not resetting this can lead to lots of flakes, since the test will use
whatever the host system has to be set in it's containers.conf.

Fixes: containers#9286

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

LGTM
assuming happy tests

@rhatdan rhatdan added the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2021
@openshift-merge-robot openshift-merge-robot merged commit 2d829ae into containers:master Feb 9, 2021
@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 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 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.

7 participants