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

Add new rules package_ntp_removed, package_timesyncd_removed #11831

Merged
merged 1 commit into from
May 7, 2024
Merged

Add new rules package_ntp_removed, package_timesyncd_removed #11831

merged 1 commit into from
May 7, 2024

Conversation

mpurg
Copy link
Contributor

@mpurg mpurg commented Apr 17, 2024

Description:

  • Added new rules for removing packages ntp and systemd-timesyncd
  • Satisfies Ubuntu 22.04 STIGs: UBTU-22-215025 UBTU-220-215020
  • Based on package_ntp_installed / package_timesyncd_installed

@mpurg mpurg requested a review from a team as a code owner April 17, 2024 07:54
@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Apr 17, 2024
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Apr 17, 2024

Hi @mpurg. Thanks for your PR.

I'm waiting for a ComplianceAsCode member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@github-actions GitHub Actions
Copy link

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

ubuntu2204 (from CTF) Environment (using Fedora as testing environment)
Open in Gitpod

Fedora Testing Environment
Open in Gitpod

Oracle Linux 8 Environment
Open in Gitpod

@github-actions GitHub Actions
Copy link

github-actions bot commented Apr 17, 2024 •
edited
Loading

🤖 A k8s content image for this PR is available at:
ghcr.io/complianceascode/k8scontent:11831
This image was built from commit: 08ec2b8

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:11831

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

@dodys dodys self-assigned this Apr 17, 2024
@dodys dodys added Ubuntu Ubuntu product related. New Rule Issues or pull requests related to new Rules. ok-to-test Used by openshift-ci bot. STIG STIG Benchmark related. and removed needs-ok-to-test Used by openshift-ci bot. labels Apr 17, 2024
@dodys dodys requested review from a team April 17, 2024 11:09
@dodys
Copy link
Contributor

dodys commented Apr 17, 2024

Added red-hatters and suse maintainers as this new rule might be relevant for them
@marcusburghardt @Mab879 @teacup-on-rockingchair

Mab879
Mab879 previously requested changes Apr 17, 2024
View reviewed changes
Copy link
Member

@Mab879 Mab879 left a comment

Choose a reason for hiding this comment

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

@mpurg you will need to add these rules to the correct component files. package_ntp_removed should go in components/ntp.yml. package_timesyncd_removed should go in components/systemd.yml.

@mpurg mpurg force-pushed the ubuntu_2204_stig_215020_215025 branch from 0ebdd79 to a4437c4 Compare April 18, 2024 08:38
@mpurg
Copy link
Contributor Author

mpurg commented Apr 18, 2024

@Mab879 thanks for catching that. I wasn't aware this was a requirement. I added package_timesyncd_removed to both systemd.yml and ntp.yml since the latter also contains package_timesyncd_installed.

@dodys
Copy link
Contributor

dodys commented Apr 18, 2024

/packit retest-failed

1 similar comment
@dodys
Copy link
Contributor

dodys commented Apr 18, 2024

/packit retest-failed

@Mab879
Copy link
Member

Mab879 commented Apr 18, 2024

/packit build

@Mab879
Copy link
Member

Mab879 commented Apr 18, 2024

@mpurg I would try rebasing on master to fix the testing farm errors.

@mpurg mpurg force-pushed the ubuntu_2204_stig_215020_215025 branch from a4437c4 to fd56f6b Compare April 18, 2024 18:14
@mpurg
Copy link
Contributor Author

mpurg commented Apr 18, 2024

@Mab879 done

@Mab879
Copy link
Member

Mab879 commented Apr 19, 2024

@Mab879 done

That seems to fix it. Thanks!

@Mab879 Mab879 dismissed their stale review April 19, 2024 03:27

Requsted changes have been made.

teacup-on-rockingchair
teacup-on-rockingchair approved these changes Apr 19, 2024
View reviewed changes
Copy link
Contributor

@teacup-on-rockingchair teacup-on-rockingchair left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@mpurg mpurg force-pushed the ubuntu_2204_stig_215020_215025 branch from fd56f6b to 2e4e81f Compare April 29, 2024 07:51
@dodys
Copy link
Contributor

dodys commented Apr 30, 2024

/packit build

dodys
dodys approved these changes May 6, 2024
View reviewed changes
Copy link
Contributor

@dodys dodys left a comment

Choose a reason for hiding this comment

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

lgtm, thanks!

@dodys
Copy link
Contributor

dodys commented May 6, 2024

/packit build

@marcusburghardt marcusburghardt added this to the 0.1.74 milestone May 6, 2024
@mpurg
Add new rules package_ntp_removed, package_timesyncd_removed
08ec2b8 
Added new rules for removing packages ntp and systemd-timesyncd.

package_ntp_removed
- satisfies UBTU-22-215025
- based on package_ntp_installed

package_timesyncd_removed
- satisfies UBTU-22-215020
- based on package_timesyncd_installed
@mpurg mpurg force-pushed the ubuntu_2204_stig_215020_215025 branch from 2e4e81f to 08ec2b8 Compare May 6, 2024 14:15
@codeclimate CodeClimate
Copy link

codeclimate bot commented May 6, 2024

Code Climate has analyzed commit 08ec2b8 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.

@Mab879
Copy link
Member

Mab879 commented May 6, 2024

/packit build

@dodys dodys merged commit 65b2a96 into ComplianceAsCode:master May 7, 2024
109 of 113 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teacup-on-rockingchair teacup-on-rockingchair teacup-on-rockingchair approved these changes

@dodys dodys dodys approved these changes

@Mab879 Mab879 Mab879 left review comments

Assignees

@dodys dodys

Labels
New Rule Issues or pull requests related to new Rules. ok-to-test Used by openshift-ci bot. STIG STIG Benchmark related. Ubuntu Ubuntu product related.
Projects
None yet
Milestone
0.1.74
Development

Successfully merging this pull request may close these issues.
5 participants
@mpurg @dodys @Mab879 @teacup-on-rockingchair @marcusburghardt