Apply suggestions from code review

Co-authored-by: Tim Bannister <[email protected]>

Author: KnVerey

content/en/docs/reference/labels-annotations-taints/_index.md

@@ -98,6 +98,7 @@ Example: `applyset.k8s.io/additional-namespaces: "namespace1,namespace2"`
 
 Used on: Objects being used as ApplySet parents.
 
+Use of this label is alpha.
 For Kubernetes version {{< skew currentVersion >}}, you can use this label on Secrets, ConfigMaps, or custom resources if the {{< glossary_tooltip term_id="CustomResourceDefinition" text="CustomResourceDefinition" >}} defining them has the `applyset.k8s.io/is-parent-type` label.
 
 Part of the specification used to implement [ApplySet-based pruning in kubectl](/docs/tasks/manage-kubernetes-objects/declarative-config/#alternative-kubectl-apply-f-directory-prune). This annotation is applied to the parent object used to track an ApplySet to extend the scope of the ApplySet beyond the parent object's own namespace (if any). The value is a comma-separated list of the names of namespaces other than the parent's namespace in which objects are found.
@@ -108,6 +109,7 @@ Example: `applyset.k8s.io/contains-group-resources: "certificates.cert-manager.i
 
 Used on: Objects being used as ApplySet parents.
 
+Use of this label is alpha.
 For Kubernetes version {{< skew currentVersion >}}, you can use this label on Secrets, ConfigMaps, or custom resources if the {{< glossary_tooltip term_id="CustomResourceDefinition" text="CustomResourceDefinition" >}} defining them has the `applyset.k8s.io/is-parent-type` label.
 
 Part of the specification used to implement [ApplySet-based pruning in kubectl](/docs/tasks/manage-kubernetes-objects/declarative-config/#alternative-kubectl-apply-f-directory-prune). This annotation is applied to the parent object used to track an ApplySet to optimize listing of ApplySet member objects. It is optional in the ApplySet specification, as tools can perform discovery or use a different optimization. However, as of Kubernetes version {{< skew currentVersion >}}, it is required by kubectl. When present, the value of this annotation must be a comma separated list of the group-kinds, in the fully-qualified name format, i.e. `<resource>.<group>`.
@@ -119,6 +121,7 @@ Example: `applyset.k8s.io/id: "applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1
 
 Used on: Objects being used as ApplySet parents.
 
+Use of this label is alpha.
 For Kubernetes version {{< skew currentVersion >}}, you can use this label on Secrets, ConfigMaps, or custom resources if the {{< glossary_tooltip term_id="CustomResourceDefinition" text="CustomResourceDefinition" >}} defining them has the `applyset.k8s.io/is-parent-type` label.
 
 Part of the specification used to implement [ApplySet-based pruning in kubectl](/docs/tasks/manage-kubernetes-objects/declarative-config/#alternative-kubectl-apply-f-directory-prune). This label is what makes an object an ApplySet parent object. Its value is the unique ID of the ApplySet, which is derived from the identity of the parent object itself. This ID **must** be the base64 encoding (using the URL safe encoding of RFC4648) of the hash of the group-kind-name-namespace of the object it is on, in the form: `<base64(sha256(<name>.<namespace>.<kind>.<group>))>`. There is no relation between the value of this label and object UIDs.
@@ -129,6 +132,7 @@ Example: `applyset.k8s.io/is-parent-type: "true"`
 
 Used on: Custom Resource Definition (CRD)
 
+Use of this label is alpha.
 Part of the specification used to implement [ApplySet-based pruning in kubectl](/docs/tasks/manage-kubernetes-objects/declarative-config/#alternative-kubectl-apply-f-directory-prune). You can set this label on a {{< glossary_tooltip term_id="CustomResourceDefinition" text="CustomResourceDefinition" >}} (CRD) to identify the custom resource type it defines (not the CRD itself) as an allowed parent for an ApplySet. The only permitted value for this label is `"true"`; if you want to mark a CRD as not being a valid parent for ApplySets, omit this label.
 
 ### applyset.k8s.io/part-of
@@ -137,6 +141,7 @@ Example: `applyset.k8s.io/part-of: "applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4
 
 Used on: All objects.
 
+Use of this label is alpha.
 Part of the specification used to implement [ApplySet-based pruning in kubectl](/docs/tasks/manage-kubernetes-objects/declarative-config/#alternative-kubectl-apply-f-directory-prune). This label is what makes an object a member of an ApplySet. The value of the label **must** match the value of the `applyset.k8s.io/id` label on the parent object.
 
 ### applyset.k8s.io/tooling
@@ -145,6 +150,7 @@ Example: `applyset.k8s.io/tooling: "kubectl/v{{< skew currentVersion >}}"`
 
 Used on: Objects being used as ApplySet parents.
 
+Use of this label is alpha.
 For Kubernetes version {{< skew currentVersion >}}, you can use this label on Secrets, ConfigMaps, or custom resources if the {{< glossary_tooltip term_id="CustomResourceDefinition" text="CustomResourceDefinition" >}} defining them has the `applyset.k8s.io/is-parent-type` label.
 
 Part of the specification used to implement [ApplySet-based pruning in kubectl](/docs/tasks/manage-kubernetes-objects/declarative-config/#alternative-kubectl-apply-f-directory-prune). This label is applied to the parent object used to track an ApplySet to indicate which tooling manages that ApplySet. Tooling should refuse to mutate ApplySets belonging to other tools. The value must be in the format `<toolname>/<semver>`.

content/en/docs/tasks/manage-kubernetes-objects/declarative-config.md

@@ -377,11 +377,11 @@ As an alternative to `kubectl delete`, you can use `kubectl apply` to identify o
 their manifests have been removed from a directory in the local filesystem.
 
 In Kubernetes {{< skew currentVersion >}}, there are two pruning modes available in kubectl apply:
-- Allowlist-based pruning: This mode has existed since kubectl v1.5 but is still in alpha due to usability, correctness and performance issues with its design. The ApplySet-based mode is designed to replace it, and upon its graduation, allowlist-based pruning will be deprecated using beta timelines.
-- ApplySet-based pruning: An ApplySet is a server-side object (by default, a Secret) that kubectl can use to accurately and efficiently track set membership across `apply` operations. This mode was introduced in alpha in kubectl v1.27 as a replacement for allowlist-based pruning. Unlike allowlist-based pruning, it is under active development and is expected to ultimately become generally available.
+- Allowlist-based pruning: This mode has existed since kubectl v1.5 but is still in alpha due to usability, correctness and performance issues with its design. The ApplySet-based mode is designed to replace it.
+- ApplySet-based pruning: An _apply set_ is a server-side object (by default, a Secret) that kubectl can use to accurately and efficiently track set membership across **apply** operations. This mode was introduced in alpha in kubectl v1.27 as a replacement for allowlist-based pruning.
 
 {{< tabs name="kubectl_apply_prune" >}}
-{{% tab name="Allowlist" %}}
+{{% tab name="Allow list" %}}
 
 {{< feature-state for_k8s_version="v1.5" state="alpha" >}}
 
@@ -391,13 +391,13 @@ Only use this if you know what you are doing. You must be careful when using thi
 
 To use allowlist-based pruning, add the following flags to your `kubectl apply` invocation:
 - `--prune`: Delete previously applied objects that are not in the set passed to the current invocation.
-- `--prune-allowlist`: A list of group-version-kinds (GVKs) to consider for pruning. This flag is optional but strongly encouraged, as its [default value](https://git.k8s.io/kubectl/pkg/util/prune/prune.go#L28-L50) is a partial list of both namespaced and cluster-scoped types, which can lead to surprising results.
+- `--prune-allowlist`: A list of group-version-kinds (GVKs) to consider for pruning. This flag is optional but strongly encouraged, as its default value is a partial list of both namespaced and cluster-scoped types, which can lead to surprising results.
 - `--selector/-l`: Use a label selector to constrain the set of objects selected for pruning. This flag is optional but strongly encouraged.
 - `--all`: use instead of `--selector/-l` to explicitly select all previously applied objects of the allowlisted types.
 
 Allowlist-based pruning queries the API server for all objects of the allowlisted GVKs that match the given labels (if any), and attempts to match the returned live object configurations against the object
-configuration files. If an object matches the query, and it does not have a
-configuration file in the directory, and it has a `last-applied-configuration` annotation,
+manifest files. If an object matches the query, and it does not have a
+manifest in the directory, and it has a `kubectl.kubernetes.io/last-applied-configuration` annotation,
 it is deleted.
 
 
@@ -414,7 +414,7 @@ have the labels given (if any), and do not appear in the subdirectory.
 
 {{% /tab %}}
 
-{{% tab name="ApplySet" %}}
+{{% tab name="Apply set" %}}
 
 {{< feature-state for_k8s_version="v1.27" state="alpha" >}}