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

[CI:DOCS] Quadlet: RemapUsers documentation fixes #17981

Merged
merged 1 commit into from
Apr 1, 2023
Merged

[CI:DOCS] Quadlet: RemapUsers documentation fixes #17981

merged 1 commit into from
Apr 1, 2023

Conversation

ygalblum
Copy link
Contributor

Fix the example for RemapGid from keep-id to keep-groups Reflect the chnages to the support for keep-id in Containers as well

Does this PR introduce a user-facing change?

No

None

@openshift-ci openshift-ci bot added release-note-none approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Mar 30, 2023
@ygalblum
Copy link
Contributor Author

/hold
Not sure about the changes made for RemapGid

@openshift-ci openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 30, 2023
@ygalblum ygalblum force-pushed the quadlet-doc-fixes-remap branch from a104a79 to 006bb7a Compare March 30, 2023 05:29
@ygalblum
Copy link
Contributor Author

/hold cancel
Fixed the example

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Mar 30, 2023
@ygalblum ygalblum mentioned this pull request Mar 30, 2023
Closed
vrothberg
vrothberg approved these changes Mar 30, 2023
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
@giuseppe PTAL

xduugu
xduugu reviewed Mar 30, 2023
View reviewed changes
docs/source/markdown/podman-systemd.unit.5.md Outdated
@@ -110,7 +110,7 @@ Valid options for `[Container]` are listed below:
| PodmanArgs=--add-host foobar | --add-host foobar |
| PublishPort=true | --publish |
| ReadOnly=true | --read-only |
| RemapGid=keep-id | --group-add keep-id |
| RemapGid=0:20000:400 | --group-add 0:20000:400 |
Copy link
Contributor

Choose a reason for hiding this comment

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

What I meant in my comment: Shouldn't the podman run equivalent be --gidmap instead of --group-add? At least this is what quadlet uses in the RemapUsers=manual case:

podman/pkg/systemd/quadlet/quadlet.go

Lines 907 to 914 in 60d16d9

case "manual":
if supportManual {
for _, uidMap := range uidMaps {
podman.addf("--uidmap=%s", uidMap)
}
for _, gidMap := range gidMaps {
podman.addf("--gidmap=%s", gidMap)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You're right. I've fixed it to gidmap. Thanks

giuseppe
giuseppe approved these changes Mar 30, 2023
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
Copy link
Contributor

openshift-ci bot commented Mar 30, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: giuseppe, vrothberg, ygalblum

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:
  • OWNERS [giuseppe,vrothberg,ygalblum]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ygalblum
Quadlet: RemapUsers documentation fixes
d79519e 
Fix the example for RemapGid from keep-id to keep-groups
Reflect the chnages to the support for keep-id in Containers as well

Signed-off-by: Ygal Blum <[email protected]>
@ygalblum ygalblum force-pushed the quadlet-doc-fixes-remap branch from 006bb7a to d79519e Compare March 30, 2023 12:53
@ygalblum
Copy link
Contributor Author

@vrothberg @giuseppe I've made a change after your LGTM following @xduugu's comment. PTAL

@rhatdan
Copy link
Member

rhatdan commented Apr 1, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 1, 2023
@openshift-merge-robot openshift-merge-robot merged commit 8bd1e3f into containers:main Apr 1, 2023
@ygalblum ygalblum deleted the quadlet-doc-fixes-remap branch April 2, 2023 07:05
@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 3, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@xduugu xduugu xduugu left review comments

@vrothberg vrothberg vrothberg approved these changes

@giuseppe giuseppe giuseppe approved these changes

Assignees

@rhatdan rhatdan

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. release-note-none
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@ygalblum @rhatdan @giuseppe @xduugu @vrothberg @openshift-merge-robot