From 5f192f2cb1df5b15aa1574efd565867815c3073e Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Tue, 17 Aug 2021 09:51:11 +0200
Subject: [PATCH] Add note about deprecated seccomp annotation

We now add a note to clarify that the annotations are deprecated and
will become non-functional in v1.25.

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 .../docs/reference/labels-annotations-taints.md  |  8 +++++++-
 content/en/docs/tutorials/clusters/seccomp.md    | 16 ++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/content/en/docs/reference/labels-annotations-taints.md b/content/en/docs/reference/labels-annotations-taints.md
index 07e6d19426..e2fc2b317e 100644
--- a/content/en/docs/reference/labels-annotations-taints.md
+++ b/content/en/docs/reference/labels-annotations-taints.md
@@ -425,4 +425,10 @@ policies to apply when validating a submitted Pod. Note that warnings are also d
 or updating objects that contain Pod templates, such as Deployments, Jobs, StatefulSets, etc.
 
 See [Enforcing Pod Security at the Namespace Level](/docs/concepts/security/pod-security-admission)
-for more information.
\ No newline at end of file
+for more information.
+
+## seccomp.security.alpha.kubernetes.io/pod and container.seccomp.security.alpha.kubernetes.io/[NAME] (deprecated)
+
+The seccomp annotations have been deprecated since Kubernetes v1.19 and will
+become non-functional in v1.25. Please use the `seccompProfile` of the
+`SecurityContext` instead.
\ No newline at end of file
diff --git a/content/en/docs/tutorials/clusters/seccomp.md b/content/en/docs/tutorials/clusters/seccomp.md
index c510f4c707..ce16eb524a 100644
--- a/content/en/docs/tutorials/clusters/seccomp.md
+++ b/content/en/docs/tutorials/clusters/seccomp.md
@@ -170,12 +170,20 @@ Download the correct manifest for your Kubernetes version:
 {{< tab name="v1.19 or Later (GA)" >}}
 {{< codenew file="pods/security/seccomp/ga/audit-pod.yaml" >}}
 {{< /tab >}}}
-{{{< tab name="Pre-v1.19 (alpha)" >}}
+{{{< tab name="Pre-v1.19 (deprecated)" >}}
 {{< codenew file="pods/security/seccomp/alpha/audit-pod.yaml" >}}
 {{< /tab >}}
 {{< /tabs >}}
 <br>
 
+{{< note >}}
+The functional support for the already deprecated seccomp annotations
+`seccomp.security.alpha.kubernetes.io/pod` (for the whole pod) and
+`container.seccomp.security.alpha.kubernetes.io/[name]` (for a single container)
+is going to be removed with the release of Kubernetes v1.25. Please always use
+the native API fields in favor of the annotations.
+{{< /note >}}
+
 Create the Pod in the cluster:
 
 ```
@@ -270,7 +278,7 @@ Download the correct manifest for your Kubernetes version:
 {{< tab name="v1.19 or Later (GA)" >}}
 {{< codenew file="pods/security/seccomp/ga/violation-pod.yaml" >}}
 {{< /tab >}}}
-{{{< tab name="Pre-v1.19 (alpha)" >}}
+{{{< tab name="Pre-v1.19 (deprecated)" >}}
 {{< codenew file="pods/security/seccomp/alpha/violation-pod.yaml" >}}
 {{< /tab >}}
 {{< /tabs >}}
@@ -321,7 +329,7 @@ Download the correct manifest for your Kubernetes version:
 {{< tab name="v1.19 or Later (GA)" >}}
 {{< codenew file="pods/security/seccomp/ga/fine-pod.yaml" >}}
 {{< /tab >}}}
-{{{< tab name="Pre-v1.19 (alpha)" >}}
+{{{< tab name="Pre-v1.19 (deprecated)" >}}
 {{< codenew file="pods/security/seccomp/alpha/fine-pod.yaml" >}}
 {{< /tab >}}
 {{< /tabs >}}
@@ -403,7 +411,7 @@ Download the correct manifest for your Kubernetes version:
 {{< tab name="v1.19 or Later (GA)" >}}
 {{< codenew file="pods/security/seccomp/ga/default-pod.yaml" >}}
 {{< /tab >}}}
-{{{< tab name="Pre-v1.19 (alpha)" >}}
+{{{< tab name="Pre-v1.19 (deprecated)" >}}
 {{< codenew file="pods/security/seccomp/alpha/default-pod.yaml" >}}
 {{< /tab >}}
 {{< /tabs >}}