From 87f7655302bc414bd2a19caf85676a1fc9a899df Mon Sep 17 00:00:00 2001 From: mozillazg Date: Sat, 2 Dec 2023 01:20:41 +0000 Subject: [PATCH] update version info --- cfg/config.yaml | 7 +++++++ cmd/common_test.go | 1 + docs/architecture.md | 1 + docs/platforms.md | 1 + 4 files changed, 10 insertions(+) diff --git a/cfg/config.yaml b/cfg/config.yaml index fc95ba56e..05aeeb477 100644 --- a/cfg/config.yaml +++ b/cfg/config.yaml @@ -277,6 +277,7 @@ version_mapping: "1.23": "cis-1.23" "1.24": "cis-1.24" "1.25": "cis-1.7" + "1.26": "cis-1.8" "eks-1.0.1": "eks-1.0.1" "eks-1.1.0": "eks-1.1.0" "eks-1.2.0": "eks-1.2.0" @@ -349,6 +350,12 @@ target_mapping: - "controlplane" - "etcd" - "policies" + "cis-1.8": + - "master" + - "node" + - "controlplane" + - "etcd" + - "policies" "gke-1.0": - "master" - "node" diff --git a/cmd/common_test.go b/cmd/common_test.go index 89cd7f84d..aa006b149 100644 --- a/cmd/common_test.go +++ b/cmd/common_test.go @@ -241,6 +241,7 @@ func TestMapToCISVersion(t *testing.T) { {kubeVersion: "1.23", succeed: true, exp: "cis-1.23"}, {kubeVersion: "1.24", succeed: true, exp: "cis-1.24"}, {kubeVersion: "1.25", succeed: true, exp: "cis-1.7"}, + {kubeVersion: "1.26", succeed: true, exp: "cis-1.8"}, {kubeVersion: "gke-1.2.0", succeed: true, exp: "gke-1.2.0"}, {kubeVersion: "ocp-3.10", succeed: true, exp: "rh-0.7"}, {kubeVersion: "ocp-3.11", succeed: true, exp: "rh-0.7"}, diff --git a/docs/architecture.md b/docs/architecture.md index ba5a51c6c..09d081e30 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -21,6 +21,7 @@ The following table shows the valid targets based on the CIS Benchmark version. | cis-1.23 | master, controlplane, node, etcd, policies | | cis-1.24 | master, controlplane, node, etcd, policies | | cis-1.7 | master, controlplane, node, etcd, policies | +| cis-1.8 | master, controlplane, node, etcd, policies | | gke-1.0 | master, controlplane, node, etcd, policies, managedservices | | gke-1.2.0 | controlplane, node, policies, managedservices | | eks-1.0.1 | controlplane, node, policies, managedservices | diff --git a/docs/platforms.md b/docs/platforms.md index bbfd11a64..92b6c7d10 100644 --- a/docs/platforms.md +++ b/docs/platforms.md @@ -16,6 +16,7 @@ Some defined by other hardenening guides. | CIS | [1.23](https://workbench.cisecurity.org/benchmarks/7532) | cis-1.23 | 1.22-1.23 | | CIS | [1.24](https://workbench.cisecurity.org/benchmarks/10873) | cis-1.24 | 1.24 | | CIS | [1.7](https://workbench.cisecurity.org/benchmarks/11107) | cis-1.7 | 1.25 | +| CIS | [1.8](https://workbench.cisecurity.org/benchmarks/12958) | cis-1.8 | 1.26 | | CIS | [GKE 1.0.0](https://workbench.cisecurity.org/benchmarks/4536) | gke-1.0 | GKE | | CIS | [GKE 1.2.0](https://workbench.cisecurity.org/benchmarks/7534) | gke-1.2.0 | GKE | | CIS | [EKS 1.0.1](https://workbench.cisecurity.org/benchmarks/6041) | eks-1.0.1 | EKS |