Merge master into dev-1.21

content/en/docs/reference/access-authn-authz/admission-controllers.md

@@ -669,13 +669,6 @@ allowVolumeExpansion: true
 
 For more information about persistent volume claims, see [PersistentVolumeClaims](/docs/concepts/storage/persistent-volumes/#persistentvolumeclaims).
 
-### PodPreset {#podpreset}
-
-This admission controller injects a pod with the fields specified in a matching PodPreset.
-See also [PodPreset concept](/docs/concepts/workloads/pods/podpreset/) and
-[Inject Information into Pods Using a PodPreset](/docs/tasks/inject-data-application/podpreset)
-for more information.
-
 ### PodSecurityPolicy {#podsecuritypolicy}
 
 This admission controller acts on creation and modification of the pod and determines if it should be admitted

content/en/docs/reference/access-authn-authz/rbac.md

@@ -86,6 +86,7 @@ Because ClusterRoles are cluster-scoped, you can also use them to grant access t
 * cluster-scoped resources (like {{< glossary_tooltip text="nodes" term_id="node" >}})
 * non-resource endpoints (like `/healthz`)
 * namespaced resources (like Pods), across all namespaces
+  
   For example: you can use a ClusterRole to allow a particular user to run
   `kubectl get pods --all-namespaces`
 

content/en/docs/reference/glossary/podpreset.md

@@ -1,18 +0,0 @@
----
-title: PodPreset
-id: podpreset
-date: 2018-04-12
-full_link: 
-short_description: >
-  An API object that injects information such as secrets, volume mounts, and environment variables into pods at creation time.
-
-aka: 
-tags:
-- operation
----
- An API object that injects information such as secrets, volume mounts, and environment variables into {{< glossary_tooltip text="Pods" term_id="pod" >}} at creation time.
-
-<!--more--> 
-
-This object chooses the Pods to inject information into using standard selectors. This allows the podspec definitions to be nonspecific, decoupling the podspec from environment specific configuration.
-