Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

updated incorrect CIS controls Ids and version mapping #174

Merged
merged 1 commit into from
Jan 3, 2024

Conversation

KiranBodipi
Copy link
Contributor

updated the scripts with correct CIS control Ids for controls Ids and version mapping

  1. package/cfg/k3s-cis-1.20-hardened/master.yaml - 1.2.25 id missing, found duplicate id for 1.2.26
  2. package/cfg/k3s-cis-1.23-permissive/master.yaml - 1.2.23 id missing, found duplicate id for 1.2.25
  3. package/cfg/k3s-cis-1.24-permissive/master.yaml - 1.2.23 id missing, found duplicate id for 1.2.25
  4. package/cfg/rke-cis-1.23-hardened/master.yaml - 1.2.23 id missing, found duplicate id for 1.2.25
  5. package/cfg/rke-cis-1.23-permissive/etcd.yaml - incorrect version mapping found
  6. package/cfg/rke-cis-1.24-hardened/master.yaml - 1.2.23 id missing, found duplicate id for 1.2.25
  7. package/cfg/rke-cis-1.24-permissive/etcd.yaml - incorrect version mapping found
  8. package/cfg/rke2-cis-1.23-hardened/master.yaml - 1.2.23 id missing, found duplicate id for 1.2.25
  9. package/cfg/rke2-cis-1.24-hardened/master.yaml - 1.2.23 id missing, found duplicate id for 1.2.25

@KiranBodipi KiranBodipi requested a review from a team as a code owner December 6, 2023 16:15
@KiranBodipi
Copy link
Contributor Author

Hey @macedogm @rayandas Found and fixed errors in the repo. Submitted a PR—please review and merge if approved

@@ -1,6 +1,6 @@
---
controls:
version: "cis-1.23"
version: 1.23
Copy link
Contributor

@andypitcher andypitcher Dec 7, 2023

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

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

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.

@andypitcher
Copy link
Contributor

@rayandas we will make another PR to include @KiranBodipi's changes and adjust all yamls to have version: cis-1.x.

@rayandas rayandas merged commit f06fbbc into rancher:master Jan 3, 2024
1 check passed
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants