From ec94e69c4ef0ea63692c312038f16c8fc2e1b6b7 Mon Sep 17 00:00:00 2001 From: Babapool Date: Fri, 17 Dec 2021 19:44:44 +0530 Subject: [PATCH 1/2] Merge the tutorials under tutorials->clusters into tutorials->security --- content/en/docs/tutorials/_index.md | 9 ++------- content/en/docs/tutorials/clusters/_index.md | 5 ----- .../en/docs/tutorials/{clusters => security}/apparmor.md | 0 .../en/docs/tutorials/{clusters => security}/seccomp.md | 0 static/_redirects | 3 +++ 5 files changed, 5 insertions(+), 12 deletions(-) delete mode 100644 content/en/docs/tutorials/clusters/_index.md rename content/en/docs/tutorials/{clusters => security}/apparmor.md (100%) rename content/en/docs/tutorials/{clusters => security}/seccomp.md (100%) diff --git a/content/en/docs/tutorials/_index.md b/content/en/docs/tutorials/_index.md index 0f1181e2cf..01bb9a6552 100644 --- a/content/en/docs/tutorials/_index.md +++ b/content/en/docs/tutorials/_index.md @@ -47,12 +47,6 @@ Before walking through each tutorial, you may want to bookmark the * [Running ZooKeeper, A CP Distributed System](/docs/tutorials/stateful-application/zookeeper/) -## Clusters - -* [AppArmor](/docs/tutorials/clusters/apparmor/) - -* [seccomp](/docs/tutorials/clusters/seccomp/) - ## Services * [Using Source IP](/docs/tutorials/services/source-ip/) @@ -61,7 +55,8 @@ Before walking through each tutorial, you may want to bookmark the * [Apply Pod Security Standards at Cluster level](/docs/tutorials/security/cluster-level-pss/) * [Apply Pod Security Standards at Namespace level](/docs/tutorials/security/ns-level-pss/) - +* [AppArmor](/docs/tutorials/security/apparmor/) +* [seccomp](/docs/tutorials/security/seccomp/) ## {{% heading "whatsnext" %}} If you would like to write a tutorial, see diff --git a/content/en/docs/tutorials/clusters/_index.md b/content/en/docs/tutorials/clusters/_index.md deleted file mode 100644 index 2db6156b6f..0000000000 --- a/content/en/docs/tutorials/clusters/_index.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -title: "Clusters" -weight: 60 ---- - diff --git a/content/en/docs/tutorials/clusters/apparmor.md b/content/en/docs/tutorials/security/apparmor.md similarity index 100% rename from content/en/docs/tutorials/clusters/apparmor.md rename to content/en/docs/tutorials/security/apparmor.md diff --git a/content/en/docs/tutorials/clusters/seccomp.md b/content/en/docs/tutorials/security/seccomp.md similarity index 100% rename from content/en/docs/tutorials/clusters/seccomp.md rename to content/en/docs/tutorials/security/seccomp.md diff --git a/static/_redirects b/static/_redirects index 780597c901..f8bea04f7e 100644 --- a/static/_redirects +++ b/static/_redirects @@ -546,3 +546,6 @@ /id/docs/concepts/configuration/pod-overhead/ /id/docs/concepts/scheduling-eviction/pod-overhead/ 301 /pt/* /pt-br/:splat 302! + +/docs/tutorials/clusters/apparmor.md /docs/tutorials/security/apparmor.md 301 +/docs/tutorials/clusters/seccomp.md /docs/tutorials/security/seccomp.md 301 \ No newline at end of file From cb9a103af6e9a74965329b27d9c53a2ce3ad8364 Mon Sep 17 00:00:00 2001 From: Babapool Date: Fri, 17 Dec 2021 23:00:11 +0530 Subject: [PATCH 2/2] Fix the redirect links Co-Authored-By: Tim Bannister --- static/_redirects | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/static/_redirects b/static/_redirects index f8bea04f7e..10e81668ee 100644 --- a/static/_redirects +++ b/static/_redirects @@ -335,6 +335,8 @@ /docs/tutorials/kubernetes-basics/expose-intro/ /docs/tutorials/kubernetes-basics/expose/expose-intro/ 301 /docs/tutorials/kubernetes-basics/scale-interactive/ /docs/tutorials/kubernetes-basics/scale/scale-interactive/ 301 /docs/tutorials/kubernetes-basics/scale-intro/ /docs/tutorials/kubernetes-basics/scale/scale-intro/ 301 +/docs/tutorials/clusters/apparmor/ /docs/tutorials/security/apparmor/ 301 +/docs/tutorials/clusters/seccomp/ /docs/tutorials/security/seccomp/ 301 /ja/docs/tutorials/kubernetes-basics/scale-intro/ /ja/docs/tutorials/kubernetes-basics/scale/scale-intro/ 301 /ko/docs/tutorials/kubernetes-basics/scale-intro/ /ko/docs/tutorials/kubernetes-basics/scale/scale-intro/ 301 /docs/tutorials/kubernetes-basics/update-interactive/ /docs/tutorials/kubernetes-basics/update/update-interactive/ 301 @@ -546,6 +548,3 @@ /id/docs/concepts/configuration/pod-overhead/ /id/docs/concepts/scheduling-eviction/pod-overhead/ 301 /pt/* /pt-br/:splat 302! - -/docs/tutorials/clusters/apparmor.md /docs/tutorials/security/apparmor.md 301 -/docs/tutorials/clusters/seccomp.md /docs/tutorials/security/seccomp.md 301 \ No newline at end of file