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

updated incorrect CIS controls Ids and version mapping #174

Merged
merged 1 commit into from
Jan 3, 2024
Merged

updated incorrect CIS controls Ids and version mapping #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package/cfg/k3s-cis-1.20-hardened/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,7 +723,7 @@ groups:
--audit-log-maxsize=100
scored: true

- id: 1.2.26
- id: 1.2.25
text: "Ensure that the --request-timeout argument is set as appropriate (Automated)"
audit: "journalctl -D /var/log/journal -u k3s | grep 'Running kube-apiserver' | tail -n1 | grep 'request-timeout'"
tests:
Expand Down
2 changes: 1 addition & 1 deletion package/cfg/k3s-cis-1.23-permissive/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ groups:
For example, to set it as 100 MB, --audit-log-maxsize=100
scored: true

- id: 1.2.25
- id: 1.2.23
text: "Ensure that the --request-timeout argument is set as appropriate (Automated)"
audit: "journalctl -D /var/log/journal -u k3s | grep 'Running kube-apiserver' | tail -n1 | grep -v grep"
type: "skip"
Expand Down
2 changes: 1 addition & 1 deletion package/cfg/k3s-cis-1.24-permissive/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,7 +686,7 @@ groups:
For example, to set it as 100 MB, --audit-log-maxsize=100
scored: true

- id: 1.2.25
- id: 1.2.23
text: "Ensure that the --request-timeout argument is set as appropriate (Automated)"
audit: "journalctl -D /var/log/journal -u k3s | grep 'Running kube-apiserver' | tail -n1 | grep -v grep"
type: "skip"
Expand Down
2 changes: 1 addition & 1 deletion package/cfg/rke-cis-1.23-hardened/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,7 +627,7 @@ groups:
For example, to set it as 100 MB, --audit-log-maxsize=100
scored: true

- id: 1.2.25
- id: 1.2.23
text: "Ensure that the --request-timeout argument is set as appropriate (Automated)"
audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
tests:
Expand Down
2 changes: 1 addition & 1 deletion package/cfg/rke-cis-1.23-permissive/etcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
controls:
version: "cis-1.23"
version: 1.23
Copy link
Contributor

@andypitcher andypitcher Dec 7, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

@KiranBodipi regarding the version name, I agree we should stick to kube-bench's format which uses version: cis-1.X and not version: 1.x.
IMO the cis-benchmark chart (or any other components) use cfgs filenames, so setting back the naming convention to version: cis-1.X in the yamls should be fine.
@rayandas could you confirm this ?
If we all approve this, let's change all files to use version: cis-1.X.

Copy link
Contributor

Choose a reason for hiding this comment

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

Yeah we normally follow version: 1.x only. But I saw for a few configs there are version: cis-1.x which we can change to version: 1.x

Copy link
Contributor

@rayandas rayandas Dec 11, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

Or we can keep all the configs as version: cis-1.x same as kube-bench. It shouldn’t impact anything.

Copy link
Contributor

Choose a reason for hiding this comment

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

I modified my first comment ^, kube-bench actually uses version: cis-1.x and not version: 1.x. We will have another PR to adjust all yamls to have version: cis-1.x.

Copy link
Contributor

@rayandas rayandas Jan 4, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Raised rancher/cis-operator#248 to track the changes. Someone from my team will take it up.

id: 2
text: "Etcd Node Configuration"
type: "etcd"
Expand Down
2 changes: 1 addition & 1 deletion package/cfg/rke-cis-1.24-hardened/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ groups:
For example, to set it as 100 MB, --audit-log-maxsize=100
scored: true

- id: 1.2.25
- id: 1.2.23
text: "Ensure that the --request-timeout argument is set as appropriate (Automated)"
audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
tests:
Expand Down
2 changes: 1 addition & 1 deletion package/cfg/rke-cis-1.24-permissive/etcd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
controls:
version: "cis-1.24"
version: 1.24
id: 2
text: "Etcd Node Configuration"
type: "etcd"
Expand Down
2 changes: 1 addition & 1 deletion package/cfg/rke2-cis-1.23-hardened/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ groups:
For example, to set it as 100 MB, --audit-log-maxsize=100
scored: true

- id: 1.2.25
- id: 1.2.23
text: "Ensure that the --request-timeout argument is set as appropriate (Automated)"
audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
tests:
Expand Down
2 changes: 1 addition & 1 deletion package/cfg/rke2-cis-1.24-hardened/master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ groups:
For example, to set it as 100 MB, --audit-log-maxsize=100
scored: true

- id: 1.2.25
- id: 1.2.23
text: "Ensure that the --request-timeout argument is set as appropriate (Automated)"
audit: "/bin/ps -ef | grep $apiserverbin | grep -v grep"
tests:
Expand Down