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

Add quadlet support for Rootfs and SELinux labels containers #17352

Merged
merged 2 commits into from
Feb 6, 2023

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Feb 3, 2023

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

Does this PR introduce a user-facing change?

Add Rootfs= support to podman quadlet to allow containers based on rootfs in addition to image.
SELinux label types can not be specified in quadlet, including disabling selinux separation.

@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. release-note labels Feb 3, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 3, 2023

[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 Feb 3, 2023
@rhatdan
Copy link
Member Author

rhatdan commented Feb 3, 2023

@alexlarsson PTAL

Copy link

@LorbusChris LorbusChris left a comment

Choose a reason for hiding this comment

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

one typo and one suggestion

docs/source/markdown/podman-systemd.unit.5.md Outdated Show resolved Hide resolved
docs/source/markdown/podman-systemd.unit.5.md Outdated Show resolved Hide resolved
@rhatdan rhatdan changed the title [WIP] Change quadlet to support .Rootfs directive Add quadlet support for Rootfs and SELinux labels containers Feb 4, 2023
@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 Feb 4, 2023
@rhatdan rhatdan force-pushed the rootfs branch 2 times, most recently from 4dcdd8d to fa74676 Compare February 4, 2023 14:01
@rhatdan
Copy link
Member Author

rhatdan commented Feb 4, 2023

@ygalblum @vrothberg PTAL

@rhatdan rhatdan force-pushed the rootfs branch 2 times, most recently from 6805441 to 6b82727 Compare February 4, 2023 15:43
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.

The cleanup commit is already in #17351 and should be dropped.

The rest LGTM 👍

@alexlarsson
Copy link
Contributor

lgtm

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

Add rootfs= support for quadlet containers

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Add support for disabeling SELinux process separation in the container.
Add support for setting the process type of the container.
Add support for setting the process MCS level of the container.
Add support for setting the file type of the container.

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@vrothberg
Copy link
Member

/lgtm

@ygalblum
Copy link
Contributor

ygalblum commented Feb 7, 2023

I know this OR is already merged, but I did have two nits:

  1. Docs: In a different PR, you alphabetically reordered the keys, but here RootFs was added at the wrong place
  2. E2E Tests: Should there be a test with both RootFs and Image set?

@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 11, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 11, 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. release-note
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants