From 1173667622e8bb202409999de6f98d92ce96bdff Mon Sep 17 00:00:00 2001 From: Huang Huang <mozillazg101@gmail.com> Date: Sun, 20 Jun 2021 17:56:56 +0800 Subject: [PATCH] Add docs for cis v1.20 (#914) Co-authored-by: Yoav Rotem <yoavrotems97@gmail.com> --- docs/architecture.md | 2 ++ docs/platforms.md | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/architecture.md b/docs/architecture.md index 2352cab..5b5b854 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -12,10 +12,12 @@ master.yaml, controlplane.yaml, node.yaml, etcd.yaml, policies.yaml and config.y Check the contents of the benchmark directory under `cfg` to see which targets are available for that benchmark. Each file except `config.yaml` represents a target (also known as a `control` in other parts of this documentation). The following table shows the valid targets based on the CIS Benchmark version. + | CIS Benchmark | Targets | |---|---| | cis-1.5| master, controlplane, node, etcd, policies | | cis-1.6| master, controlplane, node, etcd, policies | +|cis-1.20| master, controlplane, node, etcd, policies | | gke-1.0| master, controlplane, node, etcd, policies, managedservices | | eks-1.0| controlplane, node, policies, managedservices | | ack-1.0| master, controlplane, node, etcd, policies, managedservices | diff --git a/docs/platforms.md b/docs/platforms.md index b8b20b4..00cdcd9 100644 --- a/docs/platforms.md +++ b/docs/platforms.md @@ -7,8 +7,9 @@ Some defined by other hardenening guides. | Source | Kubernetes Benchmark | kube-bench config | Kubernetes versions | |---|---|---|---| -| CIS | [1.5.1](https://workbench.cisecurity.org/benchmarks/4892) | cis-1.5 | 1.15- | -| CIS | [1.6.0](https://workbench.cisecurity.org/benchmarks/4834) | cis-1.6 | 1.16- | +| CIS | [1.5.1](https://workbench.cisecurity.org/benchmarks/4892) | cis-1.5 | 1.15 | +| CIS | [1.6.0](https://workbench.cisecurity.org/benchmarks/4834) | cis-1.6 | 1.16-1.18 | +| CIS | [1.20](https://workbench.cisecurity.org/benchmarks/6246) | cis-1.20 | 1.19-1.20 | | CIS | [GKE 1.0.0](https://workbench.cisecurity.org/benchmarks/4536) | gke-1.0 | GKE | | CIS | [EKS 1.0.0](https://workbench.cisecurity.org/benchmarks/5190) | eks-1.0 | EKS | | CIS | [ACK 1.0.0](https://workbench.cisecurity.org/benchmarks/6467) | ack-1.0 | ACK | -- GitLab