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 initial RHEL 10 CIS profiles #12075

Merged
merged 4 commits into from
Jun 20, 2024

Conversation

marcusburghardt
Copy link
Member

Description:

Add initial RHEL 10 CIS profiles.

Rationale:

Currently there is not a CIS Policy for RHEL 10. Therefore, these profiles are for experimental purposes only.

Review Hints:

The control file was based on the changes already related to CIS RHEL9 v2.0.0.
However, since the #12067 is not yet merged, some variables used in the control file are using cis_rhel8 option because the cis_rhel9 option was introduced by #12067.

This can be easily updated after, once the #12067 is merged.

Since there is not yet a CIS Policy for RHEL10, this control file was
based on RHEL9 and was created only for experimental purposes.

Signed-off-by: Marcus Burghardt <[email protected]>
There is not yet an official CIS policy for RHEL10. Therefore, these
profiles were based on existing RHEL9 profiles and were created only
for experimental purposes.

Signed-off-by: Marcus Burghardt <[email protected]>
@marcusburghardt marcusburghardt added New Profile Issues or pull requests related to new Profiles. CIS CIS Benchmark related. RHEL10 Red Hat Enterprise Linux 10 product related. labels Jun 18, 2024
@marcusburghardt marcusburghardt added this to the 0.1.74 milestone Jun 18, 2024
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Used by openshift-ci bot. label Jun 18, 2024
Copy link

openshift-ci bot commented Jun 18, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@marcusburghardt marcusburghardt marked this pull request as ready for review June 18, 2024 14:45
@marcusburghardt marcusburghardt requested a review from a team as a code owner June 18, 2024 14:45
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Used by openshift-ci bot. label Jun 18, 2024
Copy link

Start a new ephemeral environment with changes proposed in this pull request:

Fedora Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

Copy link

github-actions bot commented Jun 18, 2024

🤖 A k8s content image for this PR is available at:
ghcr.io/complianceascode/k8scontent:12075
This image was built from commit: 56eac7c

Click here to see how to deploy it

If you alread have Compliance Operator deployed:
utils/build_ds_container.py -i ghcr.io/complianceascode/k8scontent:12075

Otherwise deploy the content and operator together by checking out ComplianceAsCode/compliance-operator and:
CONTENT_IMAGE=ghcr.io/complianceascode/k8scontent:12075 make deploy-local

products/rhel10/profiles/cis.profile Outdated Show resolved Hide resolved
- l1_workstation
reference_type: cis
product: rhel10

Copy link
Collaborator

Choose a reason for hiding this comment

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

Have you checked if there are any rules that aren't applicable to RHEL 10 ?

Copy link
Member Author

Choose a reason for hiding this comment

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

I used RHEL 9 as reference and actually discovered some rules incorrectly removed in RHEL 9 profiles. It will be addressed in another PR. Regarding RHEL 10, so far I didn't find anything that caught my attention but in any case this is an experimental profile. We will be more sure when the product and respective policy are released.

RHEL 9 and RHEL 10 instead of RHEL9 and RHEL10.

Signed-off-by: Marcus Burghardt <[email protected]>
There are conflicting requirements regarding journald and rsyslog.
JournalD is the default preference for RHEL 9. Aligned the draft control
file for RHEL 10 with CIS RHEL 9 v2.0.0.

Signed-off-by: Marcus Burghardt <[email protected]>
Copy link

codeclimate bot commented Jun 19, 2024

Code Climate has analyzed commit 56eac7c and detected 0 issues on this pull request.

The test coverage on the diff in this pull request is 100.0% (50% is the threshold).

This pull request will bring the total coverage in the repository to 59.4% (0.0% change).

View more on Code Climate.

@jan-cerny jan-cerny self-assigned this Jun 20, 2024
Copy link
Collaborator

@jan-cerny jan-cerny left a comment

Choose a reason for hiding this comment

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

I have built the RHEL 10 content and viewed the built HTML guides for CIS profiles.

The CI fail on Fedora Rawhide is a problem in dnf and isn't caused by the contents of this PR.

@jan-cerny jan-cerny merged commit 51001b1 into ComplianceAsCode:master Jun 20, 2024
92 of 93 checks passed
@marcusburghardt marcusburghardt deleted the cis_rhel10_draft branch June 20, 2024 07:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CIS CIS Benchmark related. New Profile Issues or pull requests related to new Profiles. RHEL10 Red Hat Enterprise Linux 10 product related.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants