From 23434ce11ee4fb59ed02c8b81e95996a0d18ead0 Mon Sep 17 00:00:00 2001 From: Catherine Luse Date: Wed, 30 Sep 2020 00:32:18 -0700 Subject: [PATCH] Update structure for Hardening and Self Assessment guides --- content/rancher/v2.x/en/security/_index.md | 2 +- .../v2.x/en/security/rancher-2.1/_index.md | 20 +++++++++++++++++++ .../{ => rancher-2.1}/benchmark-2.1/_index.md | 2 ++ .../{ => rancher-2.1}/hardening-2.1/_index.md | 2 ++ .../v2.x/en/security/rancher-2.2/_index.md | 20 +++++++++++++++++++ .../{ => rancher-2.2}/benchmark-2.2/_index.md | 2 ++ .../{ => rancher-2.2}/hardening-2.2/_index.md | 2 ++ .../v2.x/en/security/rancher-2.3.x/_index.md | 10 ++++++++++ .../rancher-2.3.x/rancher-v2.3.0/_index.md | 20 +++++++++++++++++++ .../rancher-v2.3.0}/benchmark-2.3/_index.md | 2 ++ .../rancher-v2.3.0}/hardening-2.3/_index.md | 2 ++ .../rancher-2.3.x/rancher-v2.3.3/_index.md | 20 +++++++++++++++++++ .../rancher-v2.3.3}/benchmark-2.3.3/_index.md | 2 ++ .../rancher-v2.3.3}/hardening-2.3.3/_index.md | 2 ++ .../rancher-2.3.x/rancher-v2.3.5/_index.md | 20 +++++++++++++++++++ .../rancher-v2.3.5}/benchmark-2.3.5/_index.md | 2 ++ .../rancher-v2.3.5}/hardening-2.3.5/_index.md | 2 ++ .../v2.x/en/security/rancher-2.4/_index.md | 20 +++++++++++++++++++ .../{ => rancher-2.4}/benchmark-2.4/_index.md | 2 ++ .../{ => rancher-2.4}/hardening-2.4/_index.md | 2 ++ .../v2.x/en/security/rancher-2.5/_index.md | 2 +- .../{k3s => }/benchmark-2.5/_index.md | 0 .../{k3s => }/hardening-2.5/_index.md | 0 .../en/security/rancher-2.5/k3s/_index.md | 4 ---- .../security/rancher-2.5/rancherd/_index.md | 4 ---- .../rancherd/benchmark-2.5/_index.md | 4 ---- .../rancherd/hardening-2.5/_index.md | 4 ---- .../en/security/rancher-2.5/rke/_index.md | 4 ---- .../rancher-2.5/rke/benchmark-2.5/_index.md | 4 ---- .../rancher-2.5/rke/hardening-2.5/_index.md | 4 ---- .../v2.x/en/security/security-scan/_index.md | 2 +- 31 files changed, 157 insertions(+), 31 deletions(-) create mode 100644 content/rancher/v2.x/en/security/rancher-2.1/_index.md rename content/rancher/v2.x/en/security/{ => rancher-2.1}/benchmark-2.1/_index.md (99%) rename content/rancher/v2.x/en/security/{ => rancher-2.1}/hardening-2.1/_index.md (99%) create mode 100644 content/rancher/v2.x/en/security/rancher-2.2/_index.md rename content/rancher/v2.x/en/security/{ => rancher-2.2}/benchmark-2.2/_index.md (99%) rename content/rancher/v2.x/en/security/{ => rancher-2.2}/hardening-2.2/_index.md (99%) create mode 100644 content/rancher/v2.x/en/security/rancher-2.3.x/_index.md create mode 100644 content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/_index.md rename content/rancher/v2.x/en/security/{ => rancher-2.3.x/rancher-v2.3.0}/benchmark-2.3/_index.md (99%) rename content/rancher/v2.x/en/security/{ => rancher-2.3.x/rancher-v2.3.0}/hardening-2.3/_index.md (99%) create mode 100644 content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/_index.md rename content/rancher/v2.x/en/security/{ => rancher-2.3.x/rancher-v2.3.3}/benchmark-2.3.3/_index.md (99%) rename content/rancher/v2.x/en/security/{ => rancher-2.3.x/rancher-v2.3.3}/hardening-2.3.3/_index.md (99%) create mode 100644 content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/_index.md rename content/rancher/v2.x/en/security/{ => rancher-2.3.x/rancher-v2.3.5}/benchmark-2.3.5/_index.md (99%) rename content/rancher/v2.x/en/security/{ => rancher-2.3.x/rancher-v2.3.5}/hardening-2.3.5/_index.md (99%) create mode 100644 content/rancher/v2.x/en/security/rancher-2.4/_index.md rename content/rancher/v2.x/en/security/{ => rancher-2.4}/benchmark-2.4/_index.md (99%) rename content/rancher/v2.x/en/security/{ => rancher-2.4}/hardening-2.4/_index.md (99%) rename content/rancher/v2.x/en/security/rancher-2.5/{k3s => }/benchmark-2.5/_index.md (100%) rename content/rancher/v2.x/en/security/rancher-2.5/{k3s => }/hardening-2.5/_index.md (100%) delete mode 100644 content/rancher/v2.x/en/security/rancher-2.5/k3s/_index.md delete mode 100644 content/rancher/v2.x/en/security/rancher-2.5/rancherd/_index.md delete mode 100644 content/rancher/v2.x/en/security/rancher-2.5/rancherd/benchmark-2.5/_index.md delete mode 100644 content/rancher/v2.x/en/security/rancher-2.5/rancherd/hardening-2.5/_index.md delete mode 100644 content/rancher/v2.x/en/security/rancher-2.5/rke/_index.md delete mode 100644 content/rancher/v2.x/en/security/rancher-2.5/rke/benchmark-2.5/_index.md delete mode 100644 content/rancher/v2.x/en/security/rancher-2.5/rke/hardening-2.5/_index.md diff --git a/content/rancher/v2.x/en/security/_index.md b/content/rancher/v2.x/en/security/_index.md index 8f99fc5b739..7107c1a8802 100644 --- a/content/rancher/v2.x/en/security/_index.md +++ b/content/rancher/v2.x/en/security/_index.md @@ -47,7 +47,7 @@ The Benchmark provides recommendations of two types: Scored and Not Scored. We r When Rancher runs a CIS security scan on a cluster, it generates a report showing the results of each test, including a summary with the number of passed, skipped and failed tests. The report also includes remediation steps for any failed tests. -For details, refer to the section on [security scans.]({{}}/rancher/v2.x/en/security/security-scan) +For details, refer to the section on [security scans.]({{}}/rancher/v2.x/en/cis-scans) ### Rancher Hardening Guide diff --git a/content/rancher/v2.x/en/security/rancher-2.1/_index.md b/content/rancher/v2.x/en/security/rancher-2.1/_index.md new file mode 100644 index 00000000000..31ca2f58b5a --- /dev/null +++ b/content/rancher/v2.x/en/security/rancher-2.1/_index.md @@ -0,0 +1,20 @@ +--- +title: Rancher v2.1 +weight: 5 +--- + +### Self Assessment Guide + +This [guide](./benchmark-2.1) corresponds to specific versions of the hardening guide, Rancher, Kubernetes, and the CIS Benchmark: + +Self Assessment Guide Version | Rancher Version | Hardening Guide Version | Kubernetes Version | CIS Benchmark Version +---------------------------|----------|---------|-------|----- +Self Assessment Guide v2.1 | Rancher v2.1.x | Hardening Guide v2.1 | Kubernetes 1.11 | Benchmark 1.3.0 + +### Hardening Guide + +This hardening [guide](./hardening-2.1) is intended to be used with specific versions of the CIS Kubernetes Benchmark, Kubernetes, and Rancher: + +Hardening Guide Version | Rancher Version | CIS Benchmark Version | Kubernetes Version +------------------------|----------------|-----------------------|------------------ +Hardening Guide v2.1 | Rancher v2.1.x | Benchmark v1.3.0 | Kubernetes 1.11 diff --git a/content/rancher/v2.x/en/security/benchmark-2.1/_index.md b/content/rancher/v2.x/en/security/rancher-2.1/benchmark-2.1/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/benchmark-2.1/_index.md rename to content/rancher/v2.x/en/security/rancher-2.1/benchmark-2.1/_index.md index 50b79795bf2..84112b8af6a 100644 --- a/content/rancher/v2.x/en/security/benchmark-2.1/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.1/benchmark-2.1/_index.md @@ -1,6 +1,8 @@ --- title: CIS Benchmark Rancher Self-Assessment Guide v2.1 weight: 209 +aliases: + - /rancher/v2.x/en/security/benchmark-2.1 --- This document is a companion to the Rancher v2.1 security hardening guide. The hardening guide provides prescriptive guidance for hardening a production installation of Rancher, and this benchmark guide is meant to help you evaluate the level of security of the hardened cluster against each control in the benchmark. diff --git a/content/rancher/v2.x/en/security/hardening-2.1/_index.md b/content/rancher/v2.x/en/security/rancher-2.1/hardening-2.1/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/hardening-2.1/_index.md rename to content/rancher/v2.x/en/security/rancher-2.1/hardening-2.1/_index.md index 0248d9f3f9d..7244d56d823 100644 --- a/content/rancher/v2.x/en/security/hardening-2.1/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.1/hardening-2.1/_index.md @@ -1,6 +1,8 @@ --- title: Hardening Guide v2.1 weight: 104 +aliases: + - /rancher/v2.x/en/security/hardening-2.1 --- This document provides prescriptive guidance for hardening a production installation of Rancher v2.1.x. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS). diff --git a/content/rancher/v2.x/en/security/rancher-2.2/_index.md b/content/rancher/v2.x/en/security/rancher-2.2/_index.md new file mode 100644 index 00000000000..457ecb4477d --- /dev/null +++ b/content/rancher/v2.x/en/security/rancher-2.2/_index.md @@ -0,0 +1,20 @@ +--- +title: Rancher v2.2 +weight: 4 +--- + +### Self Assessment Guide + +This [guide](./benchmark-2.2) corresponds to specific versions of the hardening guide, Rancher, Kubernetes, and the CIS Benchmark: + +Self Assessment Guide Version | Rancher Version | Hardening Guide Version | Kubernetes Version | CIS Benchmark Version +---------------------------|----------|---------|-------|----- +Self Assessment Guide v2.2 | Rancher v2.2.x | Hardening Guide v2.2 | Kubernetes 1.13 | Benchmark v1.4.0 and v1.4.1 + +### Hardening Guide + +This hardening [guide](./hardening-2.2) is intended to be used with specific versions of the CIS Kubernetes Benchmark, Kubernetes, and Rancher: + +Hardening Guide Version | Rancher Version | CIS Benchmark Version | Kubernetes Version +------------------------|----------------|-----------------------|------------------ +Hardening Guide v2.2 | Rancher v2.2.x | Benchmark v1.4.1, 1.4.0 | Kubernetes 1.13 \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/benchmark-2.2/_index.md b/content/rancher/v2.x/en/security/rancher-2.2/benchmark-2.2/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/benchmark-2.2/_index.md rename to content/rancher/v2.x/en/security/rancher-2.2/benchmark-2.2/_index.md index 68bbaa1ad7b..9ae8594599c 100644 --- a/content/rancher/v2.x/en/security/benchmark-2.2/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.2/benchmark-2.2/_index.md @@ -1,6 +1,8 @@ --- title: CIS Benchmark Rancher Self-Assessment Guide v2.2 weight: 208 +aliases: + - /rancher/v2.x/en/security/benchmark-2.2 --- This document is a companion to the Rancher v2.2 security hardening guide. The hardening guide provides prescriptive guidance for hardening a production installation of Rancher, and this benchmark guide is meant to help you evaluate the level of security of the hardened cluster against each control in the benchmark. diff --git a/content/rancher/v2.x/en/security/hardening-2.2/_index.md b/content/rancher/v2.x/en/security/rancher-2.2/hardening-2.2/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/hardening-2.2/_index.md rename to content/rancher/v2.x/en/security/rancher-2.2/hardening-2.2/_index.md index de19613499f..4afb7f76d8d 100644 --- a/content/rancher/v2.x/en/security/hardening-2.2/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.2/hardening-2.2/_index.md @@ -1,6 +1,8 @@ --- title: Hardening Guide v2.2 weight: 103 +aliases: + - /rancher/v2.x/en/security/hardening-2.2 --- This document provides prescriptive guidance for hardening a production installation of Rancher v2.2.x. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS). diff --git a/content/rancher/v2.x/en/security/rancher-2.3.x/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/_index.md new file mode 100644 index 00000000000..0f3f04da692 --- /dev/null +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/_index.md @@ -0,0 +1,10 @@ +--- +title: Rancher v2.3.x +weight: 3 +--- + +The relevant Hardening Guide and Self Assessment guide depends on your Rancher version: + +- [Rancher v2.3.5](./rancher-v2.3.5) +- [Rancher v2.3.3](./rancher-v2.3.3) +- [Rancher v2.3.0](./rancher-v2.3.0) \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/_index.md new file mode 100644 index 00000000000..aa31c9c9af7 --- /dev/null +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/_index.md @@ -0,0 +1,20 @@ +--- +title: Rancher v2.3.0 +weight: 3 +--- + +### Self Assessment Guide + +This [guide](./benchmark-2.3) corresponds to specific versions of the hardening guide, Rancher, Kubernetes, and the CIS Benchmark: + +Self Assessment Guide Version | Rancher Version | Hardening Guide Version | Kubernetes Version | CIS Benchmark Version +---------------------------|----------|---------|-------|----- +Self Assessment Guide v2.3 | Rancher v2.3.0-2.3.2 | Hardening Guide v2.3 | Kubernetes 1.15 | Benchmark v1.4.1 + +### Hardening Guide + +This hardening [guide](./hardening-2.3) is intended to be used with specific versions of the CIS Kubernetes Benchmark, Kubernetes, and Rancher: + +Hardening Guide Version | Rancher Version | CIS Benchmark Version | Kubernetes Version +------------------------|----------------|-----------------------|------------------ +Hardening Guide v2.3 | Rancher v2.3.0-v2.3.2 | Benchmark v1.4.1 | Kubernetes 1.15 \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/benchmark-2.3/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/benchmark-2.3/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/benchmark-2.3/_index.md rename to content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/benchmark-2.3/_index.md index 09b6915dca7..1b705633948 100644 --- a/content/rancher/v2.x/en/security/benchmark-2.3/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/benchmark-2.3/_index.md @@ -1,6 +1,8 @@ --- title: CIS Benchmark Rancher Self-Assessment Guide v2.3 weight: 207 +aliases: + - /rancher/v2.x/en/security/benchmark-2.3 --- This document is a companion to the Rancher v2.3 security hardening guide. The hardening guide provides prescriptive guidance for hardening a production installation of Rancher, and this benchmark guide is meant to help you evaluate the level of security of the hardened cluster against each control in the benchmark. diff --git a/content/rancher/v2.x/en/security/hardening-2.3/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/hardening-2.3/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/hardening-2.3/_index.md rename to content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/hardening-2.3/_index.md index fb495c04b2a..4c6907e9f64 100644 --- a/content/rancher/v2.x/en/security/hardening-2.3/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.0/hardening-2.3/_index.md @@ -1,6 +1,8 @@ --- title: Hardening Guide v2.3 weight: 102 +aliases: + - /rancher/v2.x/en/security/hardening-2.3 --- This document provides prescriptive guidance for hardening a production installation of Rancher v2.3.0-v2.3.2. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS). diff --git a/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/_index.md new file mode 100644 index 00000000000..77c1c408ad9 --- /dev/null +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/_index.md @@ -0,0 +1,20 @@ +--- +title: Rancher v2.3.3 +weight: 2 +--- + +### Self Assessment Guide + +This [guide](./benchmark-2.3.3) corresponds to specific versions of the hardening guide, Rancher, Kubernetes, and the CIS Benchmark: + +Self Assessment Guide Version | Rancher Version | Hardening Guide Version | Kubernetes Version | CIS Benchmark Version +---------------------------|----------|---------|-------|----- +Self Assessment Guide v2.3.3 | Rancher v2.3.3 | Hardening Guide v2.3.3 | Kubernetes v1.16 | Benchmark v1.4.1 + +### Hardening Guide + +This hardening [guide](./hardening-2.3.3) is intended to be used with specific versions of the CIS Kubernetes Benchmark, Kubernetes, and Rancher: + +Hardening Guide Version | Rancher Version | CIS Benchmark Version | Kubernetes Version +------------------------|----------------|-----------------------|------------------ +Hardening Guide v2.3.3 | Rancher v2.3.3 | Benchmark v1.4.1 | Kubernetes 1.14, 1.15, and 1.16 \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/benchmark-2.3.3/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/benchmark-2.3.3/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/benchmark-2.3.3/_index.md rename to content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/benchmark-2.3.3/_index.md index 4f8d2d1b1f6..385d077c025 100644 --- a/content/rancher/v2.x/en/security/benchmark-2.3.3/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/benchmark-2.3.3/_index.md @@ -1,6 +1,8 @@ --- title: CIS Benchmark Rancher Self-Assessment Guide - Rancher v2.3.3 weight: 206 +aliases: + - /rancher/v2.x/en/security/benchmark-2.3.3 --- This document is a companion to the Rancher v2.3.3 security hardening guide. The hardening guide provides prescriptive guidance for hardening a production installation of Rancher, and this benchmark guide is meant to help you evaluate the level of security of the hardened cluster against each control in the benchmark. diff --git a/content/rancher/v2.x/en/security/hardening-2.3.3/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/hardening-2.3.3/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/hardening-2.3.3/_index.md rename to content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/hardening-2.3.3/_index.md index d25489d2e06..90ba7608d1a 100644 --- a/content/rancher/v2.x/en/security/hardening-2.3.3/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.3/hardening-2.3.3/_index.md @@ -1,6 +1,8 @@ --- title: Hardening Guide v2.3.3 weight: 101 +aliases: + - /rancher/v2.x/en/security/hardening-2.3.3 --- This document provides prescriptive guidance for hardening a production installation of Rancher v2.3.3. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS). diff --git a/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/_index.md new file mode 100644 index 00000000000..d6bbefc794c --- /dev/null +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/_index.md @@ -0,0 +1,20 @@ +--- +title: Rancher v2.3.5 +weight: 1 +--- + +### Self Assessment Guide + +This [guide](./benchmark-2.3.5) corresponds to specific versions of the hardening guide, Rancher, Kubernetes, and the CIS Benchmark: + +Self Assessment Guide Version | Rancher Version | Hardening Guide Version | Kubernetes Version | CIS Benchmark Version +---------------------------|----------|---------|-------|----- +Self Assessment Guide v2.3.5 | Rancher v2.3.5 | Hardening Guide v2.3.5 | Kubernetes v1.15 | Benchmark v1.5 + +### Hardening Guide + +This hardening [guide](./hardening-2.3.5) is intended to be used with specific versions of the CIS Kubernetes Benchmark, Kubernetes, and Rancher: + +Hardening Guide Version | Rancher Version | CIS Benchmark Version | Kubernetes Version +------------------------|----------------|-----------------------|------------------ +Hardening Guide v2.3.5 | Rancher v2.3.5 | Benchmark v1.5 | Kubernetes 1.15 \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/benchmark-2.3.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/benchmark-2.3.5/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/benchmark-2.3.5/_index.md rename to content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/benchmark-2.3.5/_index.md index a67a0c6cbad..6d0734a8bc8 100644 --- a/content/rancher/v2.x/en/security/benchmark-2.3.5/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/benchmark-2.3.5/_index.md @@ -1,6 +1,8 @@ --- title: CIS Benchmark Rancher Self-Assessment Guide - v2.3.5 weight: 205 +aliases: + - /rancher/v2.x/en/security/benchmark-2.3.5 --- ### CIS Kubernetes Benchmark v1.5 - Rancher v2.3.5 with Kubernetes v1.15 diff --git a/content/rancher/v2.x/en/security/hardening-2.3.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/hardening-2.3.5/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/hardening-2.3.5/_index.md rename to content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/hardening-2.3.5/_index.md index 4f9aa6849e8..1701e56ff39 100644 --- a/content/rancher/v2.x/en/security/hardening-2.3.5/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.3.x/rancher-v2.3.5/hardening-2.3.5/_index.md @@ -1,6 +1,8 @@ --- title: Hardening Guide v2.3.5 weight: 100 +aliases: + - /rancher/v2.x/en/security/hardening-2.3.5 --- This document provides prescriptive guidance for hardening a production installation of Rancher v2.3.5. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS). diff --git a/content/rancher/v2.x/en/security/rancher-2.4/_index.md b/content/rancher/v2.x/en/security/rancher-2.4/_index.md new file mode 100644 index 00000000000..67cda4137b8 --- /dev/null +++ b/content/rancher/v2.x/en/security/rancher-2.4/_index.md @@ -0,0 +1,20 @@ +--- +title: Rancher v2.4 +weight: 2 +--- + +### Self Assessment Guide + +This [guide](./benchmark-2.4) corresponds to specific versions of the hardening guide, Rancher, Kubernetes, and the CIS Benchmark: + +Self Assessment Guide Version | Rancher Version | Hardening Guide Version | Kubernetes Version | CIS Benchmark Version +---------------------------|----------|---------|-------|----- +Self Assessment Guide v2.4 | Rancher v2.4 | Hardening Guide v2.4 | Kubernetes v1.15 | Benchmark v1.5 + +### Hardening Guide + +This hardening [guide](./hardening-2.4) is intended to be used with specific versions of the CIS Kubernetes Benchmark, Kubernetes, and Rancher: + +Hardening Guide Version | Rancher Version | CIS Benchmark Version | Kubernetes Version +------------------------|----------------|-----------------------|------------------ +Hardening Guide v2.4 | Rancher v2.4 | Benchmark v1.5 | Kubernetes 1.15 diff --git a/content/rancher/v2.x/en/security/benchmark-2.4/_index.md b/content/rancher/v2.x/en/security/rancher-2.4/benchmark-2.4/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/benchmark-2.4/_index.md rename to content/rancher/v2.x/en/security/rancher-2.4/benchmark-2.4/_index.md index 672fbba7826..2f6baa62064 100644 --- a/content/rancher/v2.x/en/security/benchmark-2.4/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.4/benchmark-2.4/_index.md @@ -1,6 +1,8 @@ --- title: CIS Benchmark Rancher Self-Assessment Guide - v2.4 weight: 204 +aliases: + - /rancher/v2.x/en/security/benchmark-2.4 --- ### CIS Kubernetes Benchmark v1.5 - Rancher v2.4 with Kubernetes v1.15 diff --git a/content/rancher/v2.x/en/security/hardening-2.4/_index.md b/content/rancher/v2.x/en/security/rancher-2.4/hardening-2.4/_index.md similarity index 99% rename from content/rancher/v2.x/en/security/hardening-2.4/_index.md rename to content/rancher/v2.x/en/security/rancher-2.4/hardening-2.4/_index.md index d4ddfccc434..583080c10af 100644 --- a/content/rancher/v2.x/en/security/hardening-2.4/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.4/hardening-2.4/_index.md @@ -1,6 +1,8 @@ --- title: Hardening Guide v2.4 weight: 99 +aliases: + - /rancher/v2.x/en/security/hardening-2.4 --- This document provides prescriptive guidance for hardening a production installation of Rancher v2.4. It outlines the configurations and controls required to address Kubernetes benchmark controls from the Center for Information Security (CIS). diff --git a/content/rancher/v2.x/en/security/rancher-2.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/_index.md index 84810ef66ba..65db8244e94 100644 --- a/content/rancher/v2.x/en/security/rancher-2.5/_index.md +++ b/content/rancher/v2.x/en/security/rancher-2.5/_index.md @@ -5,4 +5,4 @@ weight: 1 > This section is under construction. -This section contains the hardening and self-assessment guides for Rancher v2.5. Separate guides are available for RancherD Kubernetes clusters, RKE Kubernetes clusters, and K3s Kubernetes clusters. \ No newline at end of file +This section contains the hardening and self-assessment guides for Rancher v2.5. \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/rancher-2.5/k3s/benchmark-2.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/benchmark-2.5/_index.md similarity index 100% rename from content/rancher/v2.x/en/security/rancher-2.5/k3s/benchmark-2.5/_index.md rename to content/rancher/v2.x/en/security/rancher-2.5/benchmark-2.5/_index.md diff --git a/content/rancher/v2.x/en/security/rancher-2.5/k3s/hardening-2.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/hardening-2.5/_index.md similarity index 100% rename from content/rancher/v2.x/en/security/rancher-2.5/k3s/hardening-2.5/_index.md rename to content/rancher/v2.x/en/security/rancher-2.5/hardening-2.5/_index.md diff --git a/content/rancher/v2.x/en/security/rancher-2.5/k3s/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/k3s/_index.md deleted file mode 100644 index 470c4e4c880..00000000000 --- a/content/rancher/v2.x/en/security/rancher-2.5/k3s/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: K3s -weight: 3 ---- \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/rancher-2.5/rancherd/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/rancherd/_index.md deleted file mode 100644 index 8c8c7247e3e..00000000000 --- a/content/rancher/v2.x/en/security/rancher-2.5/rancherd/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: RancherD -weight: 1 ---- \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/rancher-2.5/rancherd/benchmark-2.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/rancherd/benchmark-2.5/_index.md deleted file mode 100644 index 4631d4c984f..00000000000 --- a/content/rancher/v2.x/en/security/rancher-2.5/rancherd/benchmark-2.5/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Self Assessment Guide -weight: 2 ---- \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/rancher-2.5/rancherd/hardening-2.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/rancherd/hardening-2.5/_index.md deleted file mode 100644 index cfb41e6e16a..00000000000 --- a/content/rancher/v2.x/en/security/rancher-2.5/rancherd/hardening-2.5/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Hardening Guide -weight: 1 ---- \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/rancher-2.5/rke/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/rke/_index.md deleted file mode 100644 index d7b8737d2c6..00000000000 --- a/content/rancher/v2.x/en/security/rancher-2.5/rke/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: RKE -weight: 2 ---- \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/rancher-2.5/rke/benchmark-2.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/rke/benchmark-2.5/_index.md deleted file mode 100644 index 4631d4c984f..00000000000 --- a/content/rancher/v2.x/en/security/rancher-2.5/rke/benchmark-2.5/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Self Assessment Guide -weight: 2 ---- \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/rancher-2.5/rke/hardening-2.5/_index.md b/content/rancher/v2.x/en/security/rancher-2.5/rke/hardening-2.5/_index.md deleted file mode 100644 index cfb41e6e16a..00000000000 --- a/content/rancher/v2.x/en/security/rancher-2.5/rke/hardening-2.5/_index.md +++ /dev/null @@ -1,4 +0,0 @@ ---- -title: Hardening Guide -weight: 1 ---- \ No newline at end of file diff --git a/content/rancher/v2.x/en/security/security-scan/_index.md b/content/rancher/v2.x/en/security/security-scan/_index.md index ddfc7763543..bb82838bc9a 100644 --- a/content/rancher/v2.x/en/security/security-scan/_index.md +++ b/content/rancher/v2.x/en/security/security-scan/_index.md @@ -1,6 +1,6 @@ --- title: Security Scans -weight: 1 +weight: 299 --- The documentation about CIS security scans has moved [here.]({{}}/rancher/v2.x/en/cis-scans) \ No newline at end of file