Merge main into dev-1.22 to keep in sync

content/en/docs/reference/_index.md

@@ -79,6 +79,10 @@ operator to use or manage a cluster.
 * [Client authentication API (v1beta1)](/docs/reference/config-api/client-authentication.v1beta1/)
 * [WebhookAdmission configuration (v1)](/docs/reference/config-api/apiserver-webhookadmission.v1/)
 
+## Config API for kubeadm
+
+* [v1beta2](/docs/reference/config-api/kubeadm-config.v1beta2/)
+
 ## Design Docs
 
 An archive of the design docs for Kubernetes functionality. Good starting points are

content/en/docs/reference/access-authn-authz/certificate-signing-requests.md

@@ -56,11 +56,11 @@ state for some duration:
 
 * Approved requests: automatically deleted after 1 hour
 * Denied requests: automatically deleted after 1 hour
-* Pending requests: automatically deleted after 1 hour
+* Pending requests: automatically deleted after 24 hours
 
 ## Signers
 
-All signers should provide information about how they work so that clients can predict what will happen to their CSRs.
+Custom signerNames can also be specified. All signers should provide information about how they work so that clients can predict what will happen to their CSRs.
 This includes:
 
 1. **Trust distribution**: how trust (CA bundles) are distributed.

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

@@ -282,7 +282,7 @@ Of course you need to set up the webhook server to handle these authentications.
 
 ### Request
 
-Webhooks are sent a POST request, with `Content-Type: application/json`,
+Webhooks are sent as POST requests, with `Content-Type: application/json`,
 with an `AdmissionReview` API object in the `admission.k8s.io` API group
 serialized to JSON as the body.
 

content/en/docs/reference/command-line-tools-reference/feature-gates.md

@@ -59,6 +59,7 @@ different Kubernetes components.
 | `AllowInsecureBackendProxy` | `true` | Beta | 1.17 | |
 | `AnyVolumeDataSource` | `false` | Alpha | 1.18 | |
 | `AppArmor` | `true` | Beta | 1.4 | |
+| `ControllerManagerLeaderMigration` | `false` | Alpha | 1.21 | |
 | `CPUManager` | `false` | Alpha | 1.8 | 1.9 |
 | `CPUManager` | `true` | Beta | 1.10 | |
 | `CSIInlineVolume` | `false` | Alpha | 1.15 | 1.15 |
@@ -523,6 +524,11 @@ Each feature gate is designed for enabling/disabling a specific feature:
   extended tokens by starting `kube-apiserver` with flag `--service-account-extend-token-expiration=false`.
   Check [Bound Service Account Tokens](https://github.com/kubernetes/enhancements/blob/master/keps/sig-auth/1205-bound-service-account-tokens/README.md)
    for more details.
+- `ControllerManagerLeaderMigration`: Enables Leader Migration for 
+  [kube-controller-manager](/docs/tasks/administer-cluster/controller-manager-leader-migration/#initial-leader-migration-configuration) and 
+  [cloud-controller-manager](/docs/tasks/administer-cluster/controller-manager-leader-migration/#deploy-cloud-controller-manager) which allows a cluster operator to live migrate 
+  controllers from the kube-controller-manager into an external controller-manager 
+  (e.g. the cloud-controller-manager) in an HA cluster without downtime.
 - `CPUManager`: Enable container level CPU affinity support, see
   [CPU Management Policies](/docs/tasks/administer-cluster/cpu-management-policies/).
 - `CRIContainerLogRotation`: Enable container log rotation for CRI container runtime. The default max size of a log file is 10MB and the
@@ -785,7 +791,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
 - `PodOverhead`: Enable the [PodOverhead](/docs/concepts/scheduling-eviction/pod-overhead/)
   feature to account for pod overheads.
 - `PodPriority`: Enable the descheduling and preemption of Pods based on their
-  [priorities](/docs/concepts/configuration/pod-priority-preemption/).
+  [priorities](/docs/concepts/scheduling-eviction/pod-priority-preemption/).
 - `PodReadinessGates`: Enable the setting of `PodReadinessGate` field for extending
   Pod readiness evaluation.  See [Pod readiness gate](/docs/concepts/workloads/pods/pod-lifecycle/#pod-readiness-gate)
   for more details.

content/en/docs/reference/glossary/pod-priority.md

@@ -2,7 +2,7 @@
 title: Pod Priority
 id: pod-priority
 date: 2019-01-31
-full_link: /docs/concepts/configuration/pod-priority-preemption/#pod-priority
+full_link: /docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority
 short_description: >
   Pod Priority indicates the importance of a Pod relative to other Pods.
 
@@ -14,4 +14,4 @@ tags:
 
 <!--more-->
 
-[Pod Priority](/docs/concepts/configuration/pod-priority-preemption/#pod-priority) gives the ability to set scheduling priority of a Pod to be higher and lower than other Pods — an important feature for production clusters workload.
+[Pod Priority](/docs/concepts/scheduling-eviction/pod-priority-preemption/#pod-priority) gives the ability to set scheduling priority of a Pod to be higher and lower than other Pods — an important feature for production clusters workload.

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

@@ -2,7 +2,7 @@
 title: Preemption
 id: preemption
 date: 2019-01-31
-full_link: /docs/concepts/configuration/pod-priority-preemption/#preemption
+full_link: /docs/concepts/scheduling-eviction/pod-priority-preemption/#preemption
 short_description: >
   Preemption logic in Kubernetes helps a pending Pod to find a suitable Node by evicting low priority Pods existing on that Node.
 
@@ -14,4 +14,4 @@ tags:
 
 <!--more-->
 
-If a Pod cannot be scheduled, the scheduler tries to [preempt](/docs/concepts/configuration/pod-priority-preemption/#preemption) lower priority Pods to make scheduling of the pending Pod possible.
+If a Pod cannot be scheduled, the scheduler tries to [preempt](/docs/concepts/scheduling-eviction/pod-priority-preemption/#preemption) lower priority Pods to make scheduling of the pending Pod possible.

content/en/docs/reference/using-api/api-concepts.md

@@ -192,7 +192,21 @@ For example, if there are 1,253 pods on the cluster and the client wants to rece
    }
    ```
 
-Note that the `resourceVersion` of the list remains constant across each request, indicating the server is showing us a consistent snapshot of the pods. Pods that are created, updated, or deleted after version `10245` would not be shown unless the user makes a list request without the `continue` token.  This allows clients to break large requests into smaller chunks and then perform a watch operation on the full set without missing any updates.
+Note that the `resourceVersion` of the list remains constant across each request, 
+indicating the server is showing us a consistent snapshot of the pods. Pods that 
+are created, updated, or deleted after version `10245` would not be shown unless 
+the user makes a list request without the `continue` token.  This allows clients 
+to break large requests into smaller chunks and then perform a watch operation 
+on the full set without missing any updates. 
+
+`remainingItemCount` is the number of subsequent items in the list which are not 
+included in this list response. If the list request contained label or field selectors, 
+then the number of remaining items is unknown and the API server does not include 
+a `remainingItemCount` field in its response. If the list is complete (either 
+because it is not chunking or because this is the last chunk), then there are no 
+more remaining items and the API server does not include a `remainingItemCount` 
+field in its response. The intended use of the `remainingItemCount` is estimating 
+the size of a collection.
 
 
 ## Receiving resources as Tables