fix: Correct test cases and audit commands for rh-1.8, cis-1.11, gke-1.8.0, and eks-1.7.0 benchmarks#1988

Open

amitk1sharma wants to merge 1 commit intoaquasecurity:mainfrom

VoerEirAB:fix/ocp-permissions

amitk1sharma commented Oct 29, 2025 •

edited

Loading

This PR fixes several test case inconsistencies and incorrect audit commands in the benchmark YAML files for:

rh-1.8
cis-1.11
gke-1.8.0
eks-1.7.0

Changes made:

Fixed incorrect test case names and descriptions
Updated audit commands
Adjusted scored values to align with CIS standards
Improved remediation steps for clarity
Verified validation paths for OCP, GKE, and EKS consistency

Associated Issue: Fixes #1993

deebhatia reviewed

View reviewed changes

cfg/cis-1.11/master.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/cis-1.11/node.yaml

deebhatia reviewed

View reviewed changes

cfg/eks-1.7.0/controlplane.yaml

deebhatia reviewed

View reviewed changes

cfg/eks-1.7.0/controlplane.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/eks-1.7.0/node.yaml

deebhatia reviewed

View reviewed changes

cfg/eks-1.7.0/policies.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/eks-1.7.0/policies.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/eks-1.7.0/policies.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/eks-1.7.0/policies.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/eks-1.7.0/policies.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/gke-1.8.0/managedservices.yaml

deebhatia reviewed

View reviewed changes

cfg/rh-1.8/node.yaml

deebhatia reviewed

View reviewed changes

cfg/rh-1.8/node.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/rh-1.8/policies.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/rh-1.8/master.yaml

deebhatia reviewed

View reviewed changes

cfg/rh-1.8/master.yaml Outdated

deebhatia reviewed

View reviewed changes

cfg/rh-1.8/master.yaml Outdated

amitk1sharma changed the title ~~Enhance kube-bench configurations~~ fix: Correct test cases and audit commands for rh-1.8, cis-1.11, gke-1.8.0, and eks-1.7.0 benchmarks

deebhatia approved these changes

View reviewed changes

Author

amitk1sharma commented Nov 19, 2025

Hi @afdesk @mozillazg , Could you please review this PR when you get a chance?
This PR addresses Issue #1993. Thank you!

afdesk requested changes

View reviewed changes

cfg/rh-1.8/node.yaml

cfg/eks-1.7.0/policies.yaml

cfg/rh-1.8/master.yaml Outdated

cfg/rh-1.8/node.yaml Outdated

cfg/rh-1.8/policies.yaml Outdated

Collaborator

afdesk commented Nov 27, 2025

@amitk1sharma thanks a lot for your efforts!
I left some comments, could you pls clarify it?
thank you for the PR!!

Collaborator

afdesk commented Nov 27, 2025

@mozillazg @LaibaBareera Could you pls take a look at this great job too?

mozillazg reviewed

View reviewed changes

Contributor

mozillazg left a comment

@amitk1sharma Thanks for your contribution! I don't have more comments. Please check the comments from @afdesk when you get a chance. Thanks!

cfg/cis-1.11/etcd.yaml Outdated

cfg/gke-1.8.0/node.yaml

cfg/eks-1.7.0/policies.yaml

andypitcher suggested changes

View reviewed changes

cfg/cis-1.11/controlplane.yaml Outdated

cfg/cis-1.11/etcd.yaml Outdated

cfg/cis-1.11/etcd.yaml Outdated

cfg/cis-1.11/etcd.yaml Outdated

cfg/cis-1.11/master.yaml Outdated

cfg/cis-1.11/node.yaml Outdated

cfg/cis-1.11/policies.yaml Outdated

amitk1sharma force-pushed the fix/ocp-permissions branch from 8ee292d to e031393 Compare

December 23, 2025 14:32

Author

amitk1sharma commented Dec 23, 2025

Hi @afdesk @mozillazg, I have resolved the previous comments.
Kindly review the PR again when you get a chance.

amitk1sharma force-pushed the fix/ocp-permissions branch from e031393 to acf5330 Compare

January 22, 2026 06:28

Author

amitk1sharma commented Jan 22, 2026

Hi @afdesk @mozillazg,
I’ve addressed all the previous review comments.
Could you please merge this when you get a chance?

mozillazg approved these changes

View reviewed changes

Contributor

mozillazg left a comment

LGTM, Thanks for your contribution!

andypitcher approved these changes

View reviewed changes

Contributor

andypitcher left a comment •

edited

Loading

Approving the CIS-1.11 part, thanks !

Collaborator

LaibaBareera commented Feb 11, 2026

@amitk1sharma LGTM too.

afdesk approved these changes

View reviewed changes

Collaborator

afdesk commented Feb 12, 2026

@amitk1sharma could you pls rebase this branch with the main?
I can't merge it for a while
thanks

amitk1sharma force-pushed the fix/ocp-permissions branch 2 times, most recently from f394f56 to f5a3aba Compare

February 12, 2026 06:59

Author

amitk1sharma commented Feb 12, 2026 •

edited

Loading

@afdesk Rebase Done.
Could you please merge now?

afdesk requested changes

View reviewed changes

cfg/rh-1.8/node.yaml Outdated

cfg/rh-1.8/policies.yaml Outdated

cfg/rh-1.8/etcd.yaml Outdated

cfg/rh-1.8/master.yaml Outdated

cfg/rh-1.8/master.yaml Outdated

cfg/gke-1.8.0/managedservices.yaml Outdated

Collaborator

afdesk commented Feb 13, 2026

@afdesk Rebase Done. Could you please merge now?

@amitk1sharma thanks for your efforts.
there were made a lot of changes, so I had to re-review this PR again, and left some marks.

Could you pls take a look at them and update?

I realize that some notes weren't made in your PR, but these typos should be fixed too to improve the project.
Thanks a lot!

amitk1sharma force-pushed the fix/ocp-permissions branch 2 times, most recently from c9b67f9 to 8cad908 Compare

February 24, 2026 04:24

Author

amitk1sharma commented Feb 24, 2026

Hi @afdesk @mozillazg @andypitcher ,

I’ve addressed all the previous review comments and updated the PR accordingly.
Could you please take another look when you have a chance?

Thank you!

Collaborator

afdesk commented Feb 24, 2026

@amitk1sharma thank you so much for your efforts!
i'll re-review ASAP

amitk1sharma force-pushed the fix/ocp-permissions branch from 8cad908 to e911771 Compare

February 24, 2026 08:52

afdesk requested changes

View reviewed changes

cfg/rh-1.8/policies.yaml Outdated

Collaborator

afdesk commented Feb 25, 2026

@amitk1sharma thanks for your efforts!
I found an issue with one check.
could you pls take a look?

amitk1sharma force-pushed the fix/ocp-permissions branch from e911771 to 606ad21 Compare

March 3, 2026 03:31

amitk1sharma force-pushed the fix/ocp-permissions branch from 606ad21 to ea304a3 Compare

March 17, 2026 02:47

Author

amitk1sharma commented Mar 17, 2026 •

edited

Loading

Hi @afdesk @mozillazg @andypitcher,

Just a gentle follow-up on this PR.
Please let me know if any further changes are required from my side.
If everything looks good, could you please merge it when you have a chance?

Thanks!


          Enhance kube-bench configurations

e60f892

sync cfg updates

sync cfg updates with upstream

Resolve PR comments

comments resolve

PR comments resolved

Removed extra space

Correct spacing and indentation issues

Resolved PR comments

Resolve PR comments

amitk1sharma force-pushed the fix/ocp-permissions branch from ea304a3 to e60f892 Compare

March 30, 2026 07:39

Author

amitk1sharma commented Mar 30, 2026

Hi @afdesk @mozillazg @andypitcher ,

Just a gentle reminder regarding this PR. It has been open for a couple of weeks now.
Could you please take a look when you have some time and let me know if any changes are needed from my side?

Thanks in advance!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

afdesk afdesk requested changes

+3 more reviewers

mozillazg mozillazg approved these changes

deebhatia deebhatia approved these changes

andypitcher andypitcher approved these changes

Requested changes must be addressed to merge this pull request.

Labels

None yet