Skip to content

Commit 2873eea

Browse files
ttousaiafdesk
authored andcommitted
Add GKE 1.6 CIS benchmark for GCP environment (#1672)
* Add config entries for GKE 1.6 controls * Add gke1.6 control plane recommendations * Add gke-1.6.0 worker node recommendations * Add gke-1.6.0 policy recommendations * Add managed services and policy recommendation * Add master recommendations * Fix formatting across gke-1.6.0 files * Add gke-1.6.0 benchmark selection based on k8s version * Workaround: hardcode kubelet config path for gke-1.6.0 * Fix tests for makeIPTablesUtilChaings * Change scored field for all node tests to true * Fix kubelet file permission to check for --------- Co-authored-by: afdesk <work@afdesk.com>
1 parent d2041f5 commit 2873eea

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

docs/architecture.md

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,29 @@ Check the contents of the benchmark directory under `cfg` to see which targets a
1313

1414
The following table shows the valid targets based on the CIS Benchmark version.
1515

16-
| CIS Benchmark | Targets |
17-
|-------------------|---------|
18-
| cis-1.5 | master, controlplane, node, etcd, policies |
19-
| cis-1.6 | master, controlplane, node, etcd, policies |
20-
| cis-1.20 | master, controlplane, node, etcd, policies |
21-
| cis-1.23 | master, controlplane, node, etcd, policies |
22-
| cis-1.24 | master, controlplane, node, etcd, policies |
23-
| cis-1.7 | master, controlplane, node, etcd, policies |
24-
| cis-1.8 | master, controlplane, node, etcd, policies |
25-
| cis-1.9 | master, controlplane, node, etcd, policies |
26-
| gke-1.0 | master, controlplane, node, etcd, policies, managedservices |
27-
| gke-1.2.0 | controlplane, node, policies, managedservices |
28-
| eks-1.0.1 | controlplane, node, policies, managedservices |
29-
| eks-1.1.0 | controlplane, node, policies, managedservices |
30-
| eks-1.2.0 | controlplane, node, policies, managedservices |
31-
| ack-1.0 | master, controlplane, node, etcd, policies, managedservices |
32-
| aks-1.0 | controlplane, node, policies, managedservices |
33-
| rh-0.7 | master,node|
34-
| rh-1.0 | master, controlplane, node, etcd, policies |
35-
| rh-1.6 | master, controlplane, node, etcd, policies |
36-
| cis-1.6-k3s | master, controlplane, node, etcd, policies |
37-
| cis-1.24-microk8s | master, controlplane, node, etcd, policies |
16+
| CIS Benchmark | Targets |
17+
|----------------------|---------|
18+
| cis-1.5 | master, controlplane, node, etcd, policies |
19+
| cis-1.6 | master, controlplane, node, etcd, policies |
20+
| cis-1.20 | master, controlplane, node, etcd, policies |
21+
| cis-1.23 | master, controlplane, node, etcd, policies |
22+
| cis-1.24 | master, controlplane, node, etcd, policies |
23+
| cis-1.7 | master, controlplane, node, etcd, policies |
24+
| cis-1.8 | master, controlplane, node, etcd, policies |
25+
| cis-1.9 | master, controlplane, node, etcd, policies |
26+
| gke-1.0 | master, controlplane, node, etcd, policies, managedservices |
27+
| gke-1.2.0 | controlplane, node, policies, managedservices |
28+
| gke-1.6.0 | controlplane, node, policies, managedservices |
29+
| eks-1.0.1 | controlplane, node, policies, managedservices |
30+
| eks-1.1.0 | controlplane, node, policies, managedservices |
31+
| eks-1.2.0 | controlplane, node, policies, managedservices |
32+
| ack-1.0 | master, controlplane, node, etcd, policies, managedservices |
33+
| aks-1.0 | controlplane, node, policies, managedservices |
34+
| rh-0.7 | master,node|
35+
| rh-1.0 | master, controlplane, node, etcd, policies |
36+
| rh-1.6 | master, controlplane, node, etcd, policies |
37+
| cis-1.6-k3s | master, controlplane, node, etcd, policies |
38+
| cis-1.24-microk8s | master, controlplane, node, etcd, policies |
3839

3940
The following table shows the valid DISA STIG versions
4041

0 commit comments

Comments
 (0)