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

Fix non-idempotent bash remediation for sysctl template #11671

Merged
merged 1 commit into from
Mar 12, 2024
Merged

Fix non-idempotent bash remediation for sysctl template #11671

merged 1 commit into from
Mar 12, 2024

Conversation

mpurg
Copy link
Contributor

@mpurg mpurg commented Mar 11, 2024

Description:

  • Skip the systemd-sysctl symlink when commenting out existing settings in sysctl bash remediation

Rationale:

@mpurg
Fix bash remediation for sysctl template
c3dabe6 
The remediation breaks systemd-sysctl when executed multiple times.

On first run, settings are correctly added to /etc/sysctl.conf and
loaded by systemd-sysctl via the symlink
/etc/sysctl.d/99-sysctl.conf -> /etc/sysctl.conf.

On second run, the same settings are commented out in
/etc/systcl.d/99-sysctl.conf, replacing the symlink with a copy of the file.
Although the settings are again added to /etc/sysctl.conf, these
are not loaded by systemd-sysctl due to the broken link.

Fixes https://bugs.launchpad.net/usg/+bug/2056150
@openshift-ci OpenShift CI
Copy link

openshift-ci bot commented Mar 11, 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.

@openshift-ci openshift-ci bot added the needs-ok-to-test Used by openshift-ci bot. label Mar 11, 2024
@github-actions GitHub Actions
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

@github-actions GitHub Actions
Copy link

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

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

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

@dodys dodys requested a review from a team March 11, 2024 12:47
@dodys dodys self-assigned this Mar 11, 2024
@dodys dodys added ok-to-test Used by openshift-ci bot. and removed needs-ok-to-test Used by openshift-ci bot. labels Mar 11, 2024
@dodys dodys requested review from a team March 11, 2024 12:48
@dodys dodys added the Bash Bash remediation update. label Mar 11, 2024
@codeclimate CodeClimate
Copy link

codeclimate bot commented Mar 11, 2024

Code Climate has analyzed commit c3dabe6 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.8% (0.0% change).

View more on Code Climate.

dodys
dodys approved these changes Mar 11, 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!

teacup-on-rockingchair
teacup-on-rockingchair approved these changes Mar 12, 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.

Nice one 🙇

marcusburghardt
marcusburghardt approved these changes Mar 12, 2024
View reviewed changes
Copy link
Member

@marcusburghardt marcusburghardt left a comment

Choose a reason for hiding this comment

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

LGTM

@dodys dodys merged commit 7ab86c5 into ComplianceAsCode:master Mar 12, 2024
44 checks passed
@marcusburghardt marcusburghardt added this to the 0.1.73 milestone Mar 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@marcusburghardt marcusburghardt marcusburghardt approved these changes

@dodys dodys dodys approved these changes

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

Assignees

@dodys dodys

Labels
Bash Bash remediation update. ok-to-test Used by openshift-ci bot.
Projects
None yet
Milestone
0.1.73
Development

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