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

Merge custom and bundled compliance benchmarks #409

Merged
merged 1 commit into from Jan 4, 2022

Conversation

lebauce
Copy link
Contributor

@lebauce lebauce commented Nov 24, 2021

What does this PR do?

Instead of replacing the /etc/datadog-agent/compliance.d directory with the content
of a configmap, merge the benchmarks bundled with the agent and the one provided
with the configmap.

Motivation

This behaviour is the same than the security policies and it allows to both add new benchmarks
and replace existing ones.

Additional Notes

Anything else we should know when reviewing?

Describe your test plan

Write there any instructions and details you may have to test your PR.

@lebauce lebauce requested a review from a team as a code owner November 24, 2021 22:00
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

This pull request does not contain a valid label. Please add one of the following labels: bug, enhancement, documentation

@lebauce lebauce force-pushed the lebauce/do-not-override-default-benchmarks branch from ca8b911 to 0ca3e36 Compare November 24, 2021 22:05
@lebauce lebauce added the enhancement New feature or request label Nov 24, 2021
@codecov-commenter
Copy link

Codecov Report

Merging #409 (0ca3e36) into main (6ae81f2) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##             main     #409   +/-   ##
=======================================
  Coverage   66.27%   66.27%           
=======================================
  Files           3        3           
  Lines          86       86           
=======================================
  Hits           57       57           
  Misses         18       18           
  Partials       11       11           
Flag Coverage Δ
unittests 66.27% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.


Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6ae81f2...0ca3e36. Read the comment docs.

@lebauce lebauce force-pushed the lebauce/do-not-override-default-benchmarks branch from 0ca3e36 to 1e4b647 Compare November 24, 2021 22:15
@lebauce lebauce added this to the v0.8.0 milestone Nov 24, 2021
@lebauce lebauce force-pushed the lebauce/do-not-override-default-benchmarks branch from 1e4b647 to c4cfb3b Compare November 26, 2021 16:16
Copy link
Collaborator

@clamoriniere clamoriniere left a comment

Choose a reason for hiding this comment

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

I added a small comment. just to confirm the behavior

controllers/datadogagent/agent_test.go Outdated Show resolved Hide resolved
controllers/datadogagent/utils.go Show resolved Hide resolved
@lebauce lebauce force-pushed the lebauce/do-not-override-default-benchmarks branch from c4cfb3b to fbd6559 Compare November 30, 2021 21:10
@clamoriniere clamoriniere merged commit f987d4c into main Jan 4, 2022
@clamoriniere clamoriniere deleted the lebauce/do-not-override-default-benchmarks branch January 4, 2022 22:50
@khewonc khewonc mentioned this pull request May 17, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants