Merge remote-tracking branch 'upstream/master' into dev-1.19

2020-05-11 16:07:40 -04:00
parent 2cb47cb2e1 0a6f733367
commit ea8179d29d
197 changed files with 3971 additions and 922 deletions
@@ -9,32 +9,132 @@ weight: 10

 {{% capture overview %}}

-A node is a worker machine in Kubernetes, previously known as a `minion`. A node
-may be a VM or physical machine, depending on the cluster. Each node contains
-the services necessary to run [pods](/docs/concepts/workloads/pods/pod/) and is managed by the master
-components. The services on a node include the [container runtime](/docs/concepts/overview/components/#container-runtime), kubelet and kube-proxy. See
-[The Kubernetes Node](https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md#the-kubernetes-node) section in the
-architecture design doc for more details.
+Kubernetes runs your workload by placing containers into Pods to run on _Nodes_.
+A node may be a virtual or physical machine, depending on the cluster. Each node
+contains the services necessary to run
+{{< glossary_tooltip text="Pods" term_id="pod" >}}, managed by the
+{{< glossary_tooltip text="control plane" term_id="control-plane" >}}.
+
+Typically you have several nodes in a cluster; in a learning or resource-limited
+environment, you might have just one.
+
+The [components](/docs/concepts/overview/components/#node-components) on a node include the
+{{< glossary_tooltip text="kubelet" term_id="kubelet" >}}, a
+{{< glossary_tooltip text="container runtime" term_id="container-runtime" >}}, and the
+{{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}}.

 {{% /capture %}}

-
 {{% capture body %}}

-## Node Status
+## Management

-A node's status contains the following information:
+There are two main ways to have Nodes added to the {{< glossary_tooltip text="API server" term_id="kube-apiserver" >}}:
+
+1. The kubelet on a node self-registers to the control plane
+2. You, or another human user, manually add a Node object
+
+After you create a Node object, or the kubelet on a node self-registers, the
+control plane checks whether the new Node object is valid. For example, if you
+try to create a Node from the following JSON manifest:
+
+```json
+{
+  "kind": "Node",
+  "apiVersion": "v1",
+  "metadata": {
+    "name": "10.240.79.157",
+    "labels": {
+      "name": "my-first-k8s-node"
+    }
+  }
+}
+```
+
+Kubernetes creates a Node object internally (the representation). Kubernetes checks
+that a kubelet has registered to the API server that matches the `metadata.name`
+field of the Node. If the node is healthy (if all necessary services are running),
+it is eligible to run a Pod. Otherwise, that node is ignored for any cluster activity
+until it becomes healthy.
+
+{{< note >}}
+Kubernetes keeps the object for the invalid Node and continues checking to see whether
+it becomes healthy.
+
+You, or a {{< glossary_tooltip term_id="controller" text="controller">}}, must explicitly
+delete the Node object to stop that health checking.
+{{< /note >}}
+
+The name of a Node object must be a valid
+[DNS subdomain name](/docs/concepts/overview/working-with-objects/names#dns-subdomain-names).
+
+### Self-registration of Nodes
+
+When the kubelet flag `--register-node` is true (the default), the kubelet will attempt to
+register itself with the API server.  This is the preferred pattern, used by most distros.
+
+For self-registration, the kubelet is started with the following options:
+
+  - `--kubeconfig` - Path to credentials to authenticate itself to the API server.
+  - `--cloud-provider` - How to talk to a {{< glossary_tooltip text="cloud provider" term_id="cloud-provider" >}} to read metadata about itself.
+  - `--register-node` - Automatically register with the API server.
+  - `--register-with-taints` - Register the node with the given list of {{< glossary_tooltip text="taints" term_id="taint" >}} (comma separated `<key>=<value>:<effect>`).
+
+    No-op if `register-node` is false.
+  - `--node-ip` - IP address of the node.
+  - `--node-labels` - {{< glossary_tooltip text="Labels" term_id="label" >}} to add when registering the node in the cluster (see label restrictions enforced by the [NodeRestriction admission plugin](/docs/reference/access-authn-authz/admission-controllers/#noderestriction)).
+  - `--node-status-update-frequency` - Specifies how often kubelet posts node status to master.
+
+When the [Node authorization mode](/docs/reference/access-authn-authz/node/) and
+[NodeRestriction admission plugin](/docs/reference/access-authn-authz/admission-controllers/#noderestriction) are enabled,
+kubelets are only authorized to create/modify their own Node resource.
+
+### Manual Node administration
+
+You can create and modify Node objects using
+{{< glossary_tooltip text="kubectl" term_id="kubectl" >}}.
+
+When you want to create Node objects manually, set the kubelet flag `--register-node=false`.
+
+You can modify Node objects regardless of the setting of `--register-node`.
+For example, you can set labels on an existing Node, or mark it unschedulable.
+
+You can use labels on Nodes in conjunction with node selectors on Pods to control
+scheduling. For example, you can to constrain a Pod to only be eligible to run on
+a subset of the available nodes.
+
+Marking a node as unschedulable prevents the scheduler from placing new pods onto
+that Node, but does not affect existing Pods on the Node. This is useful as a
+preparatory step before a node reboot or other maintenance.
+
+To mark a Node unschedulable, run:
+
+```shell
+kubectl cordon $NODENAME
+```
+
+{{< note >}}
+Pods that are part of a {{< glossary_tooltip term_id="daemonset" >}} tolerate
+being run on an unschedulable Node. DaemonSets typically provide node-local services
+that should run on the Node even if it is being drained of workload applications.
+{{< /note >}}
+
+## Node status
+
+A Node's status contains the following information:

 * [Addresses](#addresses)
 * [Conditions](#condition)
 * [Capacity and Allocatable](#capacity)
 * [Info](#info)

-Node status and other details about a node can be displayed using the following command:
+You can use `kubectl` to view a Node's status and other details:
+
 ```shell
 kubectl describe node <insert-node-name-here>
 ```
-Each section is described in detail below.
+
+Each section of the output is described below.

 ### Addresses

@@ -49,15 +149,23 @@ The usage of these fields varies depending on your cloud provider or bare metal

 The `conditions` field describes the status of all `Running` nodes. Examples of conditions include:

-| Node Condition | Description |
-|----------------|-------------|
-| `Ready`        | `True` if the node is healthy and ready to accept pods, `False` if the node is not healthy and is not accepting pods, and `Unknown` if the node controller has not heard from the node in the last `node-monitor-grace-period` (default is 40 seconds) |
-| `MemoryPressure`    | `True` if pressure exists on the node memory -- that is, if the node memory is low; otherwise `False` |
-| `PIDPressure`    | `True` if pressure exists on the processes -- that is, if there are too many processes on the node; otherwise `False` |
-| `DiskPressure`    | `True` if pressure exists on the disk size -- that is, if the disk capacity is low; otherwise `False` |
-| `NetworkUnavailable`    | `True` if the network for the node is not correctly configured, otherwise `False` |
+{{< table caption = "Node conditions, and a description of when each condition applies." >}}
+| Node Condition       | Description |
+|----------------------|-------------|
+| `Ready`              | `True` if the node is healthy and ready to accept pods, `False` if the node is not healthy and is not accepting pods, and `Unknown` if the node controller has not heard from the node in the last `node-monitor-grace-period` (default is 40 seconds) |
+| `DiskPressure`       | `True` if pressure exists on the disk size--that is, if the disk capacity is low; otherwise `False` |
+| `MemoryPressure`     | `True` if pressure exists on the node memory--that is, if the node memory is low; otherwise `False` |
+| `PIDPressure`        | `True` if pressure exists on the processes—that is, if there are too many processes on the node; otherwise `False` |
+| `NetworkUnavailable` | `True` if the network for the node is not correctly configured, otherwise `False` |
+{{< /table >}}

-The node condition is represented as a JSON object. For example, the following response describes a healthy node.
+{{< note >}}
+If you use command-line tools to print details of a cordoned Node, the Condition includes
+`SchedulingDisabled`. `SchedulingDisabled` is not a Condition in the Kubernetes API; instead,
+cordoned nodes are marked Unschedulable in their spec.
+{{< /note >}}
+
+The node condition is represented as a JSON object. For example, the following structure describes a healthy node:

 ```json
 "conditions": [
@@ -72,20 +180,24 @@ The node condition is represented as a JSON object. For example, the following r
 ]
 ```

-If the Status of the Ready condition remains `Unknown` or `False` for longer than the `pod-eviction-timeout` (an argument passed to the [kube-controller-manager](/docs/admin/kube-controller-manager/)), all the Pods on the node are scheduled for deletion by the Node Controller. The default eviction timeout duration is **five minutes**. In some cases when the node is unreachable, the apiserver is unable to communicate with the kubelet on the node. The decision to delete the pods cannot be communicated to the kubelet until communication with the apiserver is re-established. In the meantime, the pods that are scheduled for deletion may continue to run on the partitioned node.
+If the Status of the Ready condition remains `Unknown` or `False` for longer than the `pod-eviction-timeout` (an argument passed to the {{< glossary_tooltip text="kube-controller-manager" term_id="kube-controller-manager" >}}), all the Pods on the node are scheduled for deletion by the node controller. The default eviction timeout duration is **five minutes**. In some cases when the node is unreachable, the API server is unable to communicate with the kubelet on the node. The decision to delete the pods cannot be communicated to the kubelet until communication with the API server is re-established. In the meantime, the pods that are scheduled for deletion may continue to run on the partitioned node.

-In versions of Kubernetes prior to 1.5, the node controller would [force delete](/docs/concepts/workloads/pods/pod/#force-deletion-of-pods)
-these unreachable pods from the apiserver. However, in 1.5 and higher, the node controller does not force delete pods until it is
-confirmed that they have stopped running in the cluster. You can see the pods that might be running on an unreachable node as being in
-the `Terminating` or `Unknown` state. In cases where Kubernetes cannot deduce from the underlying infrastructure if a node has
-permanently left a cluster, the cluster administrator may need to delete the node object by hand.  Deleting the node object from
-Kubernetes causes all the Pod objects running on the node to be deleted from the apiserver, and frees up their names.
+The node controller does not force delete pods until it is confirmed that they have stopped
+running in the cluster. You can see the pods that might be running on an unreachable node as
+being in the `Terminating` or `Unknown` state. In cases where Kubernetes cannot deduce from the
+underlying infrastructure if a node has permanently left a cluster, the cluster administrator
+may need to delete the node object by hand.  Deleting the node object from Kubernetes causes
+all the Pod objects running on the node to be deleted from the API server, and frees up their
+names.

 The node lifecycle controller automatically creates
-[taints](/docs/concepts/configuration/taint-and-toleration/) that represent conditions.
+[taints](/docs/concepts/scheduling-eviction/taint-and-toleration/) that represent conditions.
 The scheduler takes the Node's taints into consideration when assigning a Pod to a Node.
 Pods can also have tolerations which let them tolerate a Node's taints.

+See [Taint Nodes by Condition](/docs/concepts/configuration/taint-and-toleration/#taint-nodes-by-condition)
+for more details.
+
 ### Capacity and Allocatable {#capacity}

 Describes the resources available on the node: CPU, memory and the maximum
@@ -104,48 +216,10 @@ on a Node.
 Describes general information about the node, such as kernel version, Kubernetes version (kubelet and kube-proxy version), Docker version (if used), and OS name.
 This information is gathered by Kubelet from the node.

-## Management
+### Node controller

-Unlike [pods](/docs/concepts/workloads/pods/pod/) and [services](/docs/concepts/services-networking/service/),
-a node is not inherently created by Kubernetes: it is created externally by cloud
-providers like Google Compute Engine, or it exists in your pool of physical or virtual
-machines. So when Kubernetes creates a node, it creates
-an object that represents the node. After creation, Kubernetes
-checks whether the node is valid or not. For example, if you try to create
-a node from the following content:
-
-```json
-{
-  "kind": "Node",
-  "apiVersion": "v1",
-  "metadata": {
-    "name": "10.240.79.157",
-    "labels": {
-      "name": "my-first-k8s-node"
-    }
-  }
-}
-```
-
-Kubernetes creates a node object internally (the representation), and
-validates the node by health checking based on the `metadata.name` field. If the node is valid -- that is, if all necessary
-services are running -- it is eligible to run a pod. Otherwise, it is
-ignored for any cluster activity until it becomes valid.
-The name of a Node object must be a valid
-[DNS subdomain name](/docs/concepts/overview/working-with-objects/names#dns-subdomain-names).
-
-{{< note >}}
-Kubernetes keeps the object for the invalid node and keeps checking to see whether it becomes valid.
-You must explicitly delete the Node object to stop this process.
-{{< /note >}}
-
-Currently, there are three components that interact with the Kubernetes node
-interface: node controller, kubelet, and kubectl.
-
-### Node Controller
-
-The node controller is a Kubernetes master component which manages various
-aspects of nodes.
+The node {{< glossary_tooltip text="controller" term_id="controller" >}} is a
+Kubernetes control plane component that manages various aspects of nodes.

 The node controller has multiple roles in a node's life. The first is assigning a
 CIDR block to the node when it is registered (if CIDR assignment is turned on).
@@ -168,6 +242,7 @@ checks the state of each node every `--node-monitor-period` seconds.
 #### Heartbeats

 Heartbeats, sent by Kubernetes nodes, help determine the availability of a node.
+
 There are two forms of heartbeats: updates of `NodeStatus` and the
 [Lease object](/docs/reference/generated/kubernetes-api/{{< latest-version >}}/#lease-v1-coordination-k8s-io).
 Each Node has an associated Lease object in the `kube-node-lease`
@@ -188,13 +263,7 @@ a Lease object.

 #### Reliability

-In Kubernetes 1.4, we updated the logic of the node controller to better handle
-cases when a large number of nodes have problems with reaching the master
-(e.g. because the master has networking problems). Starting with 1.4, the node
-controller looks at the state of all nodes in the cluster when making a
-decision about pod eviction.
-
-In most cases, node controller limits the eviction rate to
+ In most cases, node controller limits the eviction rate to
 `--node-eviction-rate` (default 0.1) per second, meaning it won't evict pods
 from more than 1 node per 10 seconds.

@@ -220,62 +289,12 @@ completely unhealthy (i.e. there are no healthy nodes in the cluster). In such a
 case, the node controller assumes that there's some problem with master
 connectivity and stops all evictions until some connectivity is restored.

-Starting in Kubernetes 1.6, the NodeController is also responsible for evicting
-pods that are running on nodes with `NoExecute` taints, when the pods do not tolerate
-the taints. Additionally, as an alpha feature that is disabled by default, the
-NodeController is responsible for adding taints corresponding to node problems like
-node unreachable or not ready. See [this documentation](/docs/concepts/configuration/taint-and-toleration/)
-for details about `NoExecute` taints and the alpha feature.
+The node controller is also responsible for evicting pods running on nodes with
+`NoExecute` taints, unless those pods tolerate that taint.
+The node controller also adds {{< glossary_tooltip text="taints" term_id="taint" >}}
+corresponding to node problems like node unreachable or not ready. This means
+that the scheduler won't place Pods onto unhealthy nodes.

-Starting in version 1.8, the node controller can be made responsible for creating taints that represent
-Node conditions. This is an alpha feature of version 1.8.
-
-### Self-Registration of Nodes
-
-When the kubelet flag `--register-node` is true (the default), the kubelet will attempt to
-register itself with the API server.  This is the preferred pattern, used by most distros.
-
-For self-registration, the kubelet is started with the following options:
-
-  - `--kubeconfig` - Path to credentials to authenticate itself to the apiserver.
-  - `--cloud-provider` - How to talk to a cloud provider to read metadata about itself.
-  - `--register-node` - Automatically register with the API server.
-  - `--register-with-taints` - Register the node with the given list of taints (comma separated `<key>=<value>:<effect>`). No-op if `register-node` is false.
-  - `--node-ip` - IP address of the node.
-  - `--node-labels` - Labels to add when registering the node in the cluster (see label restrictions enforced by the [NodeRestriction admission plugin](/docs/reference/access-authn-authz/admission-controllers/#noderestriction) in 1.13+).
-  - `--node-status-update-frequency` - Specifies how often kubelet posts node status to master.
-
-When the [Node authorization mode](/docs/reference/access-authn-authz/node/) and
-[NodeRestriction admission plugin](/docs/reference/access-authn-authz/admission-controllers/#noderestriction) are enabled,
-kubelets are only authorized to create/modify their own Node resource.
-
-#### Manual Node Administration
-
-A cluster administrator can create and modify node objects.
-
-If the administrator wishes to create node objects manually, set the kubelet flag
-`--register-node=false`.
-
-The administrator can modify node resources (regardless of the setting of `--register-node`).
-Modifications include setting labels on the node and marking it unschedulable.
-
-Labels on nodes can be used in conjunction with node selectors on pods to control scheduling,
-e.g. to constrain a pod to only be eligible to run on a subset of the nodes.
-
-Marking a node as unschedulable prevents new pods from being scheduled to that
-node, but does not affect any existing pods on the node. This is useful as a
-preparatory step before a node reboot, etc. For example, to mark a node
-unschedulable, run this command:
-
-```shell
-kubectl cordon $NODENAME
-```
-
-{{< note >}}
-Pods created by a DaemonSet controller bypass the Kubernetes scheduler
-and do not respect the unschedulable attribute on a node. This assumes that daemons belong on
-the machine even if it is being drained of applications while it prepares for a reboot.
-{{< /note >}}

 {{< caution >}}
 `kubectl cordon` marks a node as 'unschedulable', which has the side effect of the service
@@ -285,34 +304,40 @@ eligible for, effectively removing incoming load balancer traffic from the cordo

 ### Node capacity

-The capacity of the node (number of cpus and amount of memory) is part of the node object.
-Normally, nodes register themselves and report their capacity when creating the node object. If
-you are doing [manual node administration](#manual-node-administration), then you need to set node
-capacity when adding a node.
+Node objects track information about the Node's resource capacity (for example: the amount
+of memory available, and the number of CPUs).
+Nodes that [self register](#self-registration-of-nodes) report their capacity during
+registration. If you [manually](#manual-node-administration) add a Node, then
+you need to set the node's capacity informaton when you add it.

-The Kubernetes scheduler ensures that there are enough resources for all the pods on a node.  It
-checks that the sum of the requests of containers on the node is no greater than the node capacity.  It
-includes all containers started by the kubelet, but not containers started directly by the [container runtime](/docs/concepts/overview/components/#container-runtime) nor any process running outside of the containers.
+The Kubernetes {{< glossary_tooltip text="scheduler" term_id="kube-scheduler" >}} ensures that
+there are enough resources for all the Pods on a Node. The scheduler checks that the sum
+of the requests of containers on the node is no greater than the node's capacity.
+That sum of requests includes all containers managed by the kubelet, but excludes any
+containers started directly by the container runtime, and also excludes any
+processes running outside of the kubelet's control.

-If you want to explicitly reserve resources for non-Pod processes, follow this tutorial to
+{{< note >}}
+If you want to explicitly reserve resources for non-Pod processes, see
 [reserve resources for system daemons](/docs/tasks/administer-cluster/reserve-compute-resources/#system-reserved).
+{{< /note >}}

 ## Node topology

-{{< feature-state state="alpha" >}}
+{{< feature-state state="alpha" for_k8s_version="v1.16" >}}

 If you have enabled the `TopologyManager`
 [feature gate](/docs/reference/command-line-tools-reference/feature-gates/), then
 the kubelet can use topology hints when making resource assignment decisions.
-
-## API Object
-
-Node is a top-level resource in the Kubernetes REST API. More details about the
-API object can be found at:
-[Node API object](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#node-v1-core).
+See [Control Topology Management Policies on a Node](/docs/tasks/administer-cluster/topology-manager/)
+for more information.

 {{% /capture %}}
 {{% capture whatsnext %}}
-* Read about [node components](/docs/concepts/overview/components/#node-components)
-* Read about node-level topology: [Control Topology Management Policies on a node](/docs/tasks/administer-cluster/topology-manager/)
+* Learn about the [components](/docs/concepts/overview/components/#node-components) that make up a node.
+* Read the [API definition for Node](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#node-v1-core).
+* Read the [Node](https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md#the-kubernetes-node)
+  section of the architecture design document.
+* Read about [taints and tolerations](/docs/concepts/configuration/taint-and-toleration/).
+* Read about [cluster autoscaling](/docs/tasks/administer-cluster/cluster-management/#cluster-autoscaling).
 {{% /capture %}}
@@ -30,6 +30,7 @@ Add-ons in each section are sorted alphabetically - the ordering does not imply
 * [Flannel](https://github.com/coreos/flannel/blob/master/Documentation/kubernetes.md) is an overlay network provider that can be used with Kubernetes.
 * [Knitter](https://github.com/ZTE/Knitter/) is a plugin to support multiple network interfaces in a Kubernetes pod.
 * [Multus](https://github.com/Intel-Corp/multus-cni) is a Multi plugin for multiple network support in Kubernetes to support all CNI plugins (e.g. Calico, Cilium, Contiv, Flannel), in addition to SRIOV, DPDK, OVS-DPDK and VPP based workloads in Kubernetes.
+* [OVN4NFV-K8S-Plugin](https://github.com/opnfv/ovn4nfv-k8s-plugin) is OVN based CNI controller plugin to provide cloud native based Service function chaining(SFC), Multiple OVN overlay networking, dynamic subnet creation, dynamic creation of virtual networks, VLAN Provider network, Direct provider network and pluggable with other Multi-network plugins, ideal for edge based cloud native workloads in Multi-cluster networking
 * [NSX-T](https://docs.vmware.com/en/VMware-NSX-T/2.0/nsxt_20_ncp_kubernetes.pdf) Container Plug-in (NCP) provides integration between VMware NSX-T and container orchestrators such as Kubernetes, as well as integration between NSX-T and container-based CaaS/PaaS platforms such as Pivotal Container Service (PKS) and OpenShift.
 * [Nuage](https://github.com/nuagenetworks/nuage-kubernetes/blob/v5.1.1-1/docs/kubernetes-1-installation.rst) is an SDN platform that provides policy-based networking between Kubernetes Pods and non-Kubernetes environments with visibility and security monitoring.
 * [Romana](http://romana.io) is a Layer 3 networking solution for pod networks that also supports the [NetworkPolicy API](/docs/concepts/services-networking/network-policies/). Kubeadm add-on installation details available [here](https://github.com/romana/romana/tree/master/containerize).
@@ -422,3 +422,15 @@ If you wish to use the external cloud provider, its repository is [TencentCloud/

 The Tencent cloud provider uses the hostname of the node (as determined by the kubelet or overridden with `--hostname-override`) as the name of the Kubernetes Node object.
 Note that the Kubernetes Node name must match the Tencent VM private IP.
+
+## Alibaba Cloud Kubernetes  
+
+ If you wish to use the external cloud provider, its repository is [kubernetes/cloud-provider-alibaba-cloud](https://github.com/kubernetes/cloud-provider-alibaba-cloud).   
+
+### Node Name  
+
+Alibaba Cloud does not require the format of node name, but the kubelet needs to add `--provider-id=${REGION_ID}.${INSTANCE_ID}`. The parameter `${REGION_ID}` represents the region id of the Kubernetes and `${INSTANCE_ID}` denotes the Alibaba ECS (Elastic Compute Service) ID.  
+
+### Load Balancers  
+
+You can setup external load balancers to use specific features in Alibaba Cloud by configuring the [annotations](https://www.alibabacloud.com/help/en/doc-detail/86531.htm) .
@@ -262,6 +262,10 @@ Lars Kellogg-Stedman.

 Multus supports all [reference plugins](https://github.com/containernetworking/plugins) (eg. [Flannel](https://github.com/containernetworking/plugins/tree/master/plugins/meta/flannel), [DHCP](https://github.com/containernetworking/plugins/tree/master/plugins/ipam/dhcp), [Macvlan](https://github.com/containernetworking/plugins/tree/master/plugins/main/macvlan)) that implement the CNI specification and 3rd party plugins (eg. [Calico](https://github.com/projectcalico/cni-plugin), [Weave](https://github.com/weaveworks/weave), [Cilium](https://github.com/cilium/cilium), [Contiv](https://github.com/contiv/netplugin)). In addition to it, Multus supports [SRIOV](https://github.com/hustcat/sriov-cni), [DPDK](https://github.com/Intel-Corp/sriov-cni), [OVS-DPDK & VPP](https://github.com/intel/vhost-user-net-plugin) workloads in Kubernetes with both cloud native and NFV based applications in Kubernetes.

+### OVN4NFV-K8s-Plugin (OVN based CNI controller & plugin)
+
+[OVN4NFV-K8S-Plugin](https://github.com/opnfv/ovn4nfv-k8s-plugin) is OVN based CNI controller plugin to provide cloud native based Service function chaining(SFC), Multiple OVN overlay networking, dynamic subnet creation, dynamic creation of virtual networks, VLAN Provider network, Direct provider network and pluggable with other Multi-network plugins, ideal for edge based cloud native workloads in Multi-cluster networking
+
 ### NSX-T

 [VMware NSX-T](https://docs.vmware.com/en/VMware-NSX-T/index.html) is a network virtualization and security platform. NSX-T can provide network virtualization for a multi-cloud and multi-hypervisor environment and is focused on emerging application frameworks and architectures that have heterogeneous endpoints and technology stacks. In addition to vSphere hypervisors, these environments include other hypervisors such as KVM, containers, and bare metal.
@@ -163,7 +163,7 @@ with the pod's tolerations in admission, effectively taking the union of the set
 by each.

 To learn more about configuring the node selector and tolerations, see [Assigning Pods to
-Nodes](/docs/concepts/configuration/assign-pod-node/).
+Nodes](/docs/concepts/scheduling-eviction/assign-pod-node/).

 [RuntimeClass admission controller]: /docs/reference/access-authn-authz/admission-controllers/#runtimeclass

@@ -86,7 +86,7 @@ Node components run on every node, maintaining running pods and providing the Ku

 {{< glossary_definition term_id="kube-proxy" length="all" >}}

-### Container Runtime
+### Container runtime

 {{< glossary_definition term_id="container-runtime" length="all" >}}

@@ -226,6 +226,6 @@ selector:
 #### Selecting sets of nodes

 One use case for selecting over labels is to constrain the set of nodes onto which a pod can schedule.
-See the documentation on [node selection](/docs/concepts/configuration/assign-pod-node/) for more information.
+See the documentation on [node selection](/docs/concepts/scheduling-eviction/assign-pod-node/) for more information.

 {{% /capture %}}
@@ -494,7 +494,8 @@ kubectl create quota test --hard=count/deployments.extensions=2,count/replicaset
 ```

 ```shell
-kubectl run nginx --image=nginx --replicas=2 --namespace=myspace
+kubectl create deployment nginx --image=nginx --namespace=myspace
+kubectl scale deployment nginx --replicas=2 --namespace=myspace
 ```

 ```shell
@@ -155,7 +155,7 @@ value is `another-node-label-value` should be preferred.

 You can see the operator `In` being used in the example. The new node affinity syntax supports the following operators: `In`, `NotIn`, `Exists`, `DoesNotExist`, `Gt`, `Lt`.
 You can use `NotIn` and `DoesNotExist` to achieve node anti-affinity behavior, or use
-[node taints](/docs/concepts/configuration/taint-and-toleration/) to repel pods from specific nodes.
+[node taints](/docs/concepts/scheduling-eviction/taint-and-toleration/) to repel pods from specific nodes.

 If you specify both `nodeSelector` and `nodeAffinity`, *both* must be satisfied for the pod
 to be scheduled onto a candidate node.
@@ -226,10 +226,11 @@ The legal operators for pod affinity and anti-affinity are `In`, `NotIn`, `Exist
 In principle, the `topologyKey` can be any legal label-key. However,
 for performance and security reasons, there are some constraints on topologyKey:

-1. For affinity and for `requiredDuringSchedulingIgnoredDuringExecution` pod anti-affinity,
-empty `topologyKey` is not allowed.
-2. For `requiredDuringSchedulingIgnoredDuringExecution` pod anti-affinity, the admission controller `LimitPodHardAntiAffinityTopology` was introduced to limit `topologyKey` to `kubernetes.io/hostname`. If you want to make it available for custom topologies, you may modify the admission controller, or simply disable it.
-3. For `preferredDuringSchedulingIgnoredDuringExecution` pod anti-affinity, empty `topologyKey` is not allowed.
+1. For pod affinity, empty `topologyKey` is not allowed in both `requiredDuringSchedulingIgnoredDuringExecution`
+and `preferredDuringSchedulingIgnoredDuringExecution`.
+2. For pod anti-affinity, empty `topologyKey` is also not allowed in both `requiredDuringSchedulingIgnoredDuringExecution`
+and `preferredDuringSchedulingIgnoredDuringExecution`.
+3. For `requiredDuringSchedulingIgnoredDuringExecution` pod anti-affinity, the admission controller `LimitPodHardAntiAffinityTopology` was introduced to limit `topologyKey` to `kubernetes.io/hostname`. If you want to make it available for custom topologies, you may modify the admission controller, or simply disable it.
 4. Except for the above cases, the `topologyKey` can be any legal label-key.

 In addition to `labelSelector` and `topologyKey`, you can optionally specify a list `namespaces`
@@ -391,7 +392,7 @@ The above pod will run on the node kube-01.

 {{% capture whatsnext %}}

-[Taints](/docs/concepts/configuration/taint-and-toleration/) allow a Node to *repel* a set of Pods.
+[Taints](/docs/concepts/scheduling-eviction/taint-and-toleration/) allow a Node to *repel* a set of Pods.

 The design documents for
 [node affinity](https://git.k8s.io/community/contributors/design-proposals/scheduling/nodeaffinity.md)
@@ -1,7 +1,7 @@
 ---
 title: Kubernetes Scheduler
 content_template: templates/concept
-weight: 50
+weight: 10
 ---

 {{% capture overview %}}
@@ -10,16 +10,17 @@ weight: 40


 {{% capture overview %}}
-Node affinity, described [here](/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity),
-is a property of *pods* that *attracts* them to a set of nodes (either as a
-preference or a hard requirement). Taints are the opposite -- they allow a
-*node* to *repel* a set of pods.
+[_Node affinity_](/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity),
+is a property of {{< glossary_tooltip text="Pods" term_id="pod" >}} that *attracts* them to
+a set of {{< glossary_tooltip text="nodes" term_id="node" >}} (either as a preference or a
+hard requirement). _Taints_ are the opposite -- they allow a node to repel a set of pods.
+
+_Tolerations_ are applied to pods, and allow (but do not require) the pods to schedule
+onto nodes with matching taints.

 Taints and tolerations work together to ensure that pods are not scheduled
 onto inappropriate nodes. One or more taints are applied to a node; this
 marks that the node should not accept any pods that do not tolerate the taints.
-Tolerations are applied to pods, and allow (but do not require) the pods to schedule
-onto nodes with matching taints.

 {{% /capture %}}

@@ -65,12 +66,12 @@ Here’s an example of a pod that uses tolerations:

 {{< codenew file="pods/pod-with-toleration.yaml" >}}

+The default value for `operator` is `Equal`.
+
 A toleration "matches" a taint if the keys are the same and the effects are the same, and:

 * the `operator` is `Exists` (in which case no `value` should be specified), or
-* the `operator` is `Equal` and the `value`s are equal
-
-`Operator` defaults to `Equal` if not specified.
+* the `operator` is `Equal` and the `value`s are equal.

 {{< note >}}

@@ -204,7 +205,7 @@ when there are node problems, which is described in the next section.

 {{< feature-state for_k8s_version="v1.18" state="stable" >}}

-Earlier we mentioned the `NoExecute` taint effect, which affects pods that are already
+The `NoExecute` taint effect, mentioned above, affects pods that are already
 running on the node as follows

 * pods that do not tolerate the taint are evicted immediately
@@ -213,9 +214,8 @@ running on the node as follows
 * pods that tolerate the taint with a specified `tolerationSeconds` remain
   bound for the specified amount of time

-In addition, Kubernetes 1.6 introduced alpha support for representing node
-problems. In other words, the node controller automatically taints a node when
-certain condition is true. The following taints are built in:
+The node controller automatically taints a Node when certain conditions
+are true. The following taints are built in:

 * `node.kubernetes.io/not-ready`: Node is not ready. This corresponds to
   the NodeCondition `Ready` being "`False`".
@@ -236,19 +236,18 @@ with `NoExecute` effect. If the fault condition returns to normal the kubelet or
 controller can remove the relevant taint(s).

 {{< note >}}
-To maintain the existing [rate limiting](/docs/concepts/architecture/nodes/)
-behavior of pod evictions due to node problems, the system actually adds the taints
-in a rate-limited way. This prevents massive pod evictions in scenarios such
-as the master becoming partitioned from the nodes.
+The control plane limits the rate of adding node new taints to nodes. This rate limiting
+manages the number of evictions that are triggered when many nodes become unreachable at
+once (for example: if there is a network disruption).
 {{< /note >}}

-The feature, in combination with `tolerationSeconds`, allows a pod
-to specify how long it should stay bound to a node that has one or both of these problems.
+You can specify `tolerationSeconds` for a Pod to define how long that Pod stays bound
+to a failing or unresponsive Node.

-For example, an application with a lot of local state might want to stay
-bound to node for a long time in the event of network partition, in the hope
+For example, you might want to keep an application with a lot of local state
+bound to node for a long time in the event of network partition, hoping
 that the partition will recover and thus the pod eviction can be avoided.
-The toleration the pod would use in that case would look like
+The toleration you set for that Pod might look like:

 ```yaml
 tolerations:
@@ -258,20 +257,15 @@ tolerations:
  tolerationSeconds: 6000
 ```

-Note that Kubernetes automatically adds a toleration for
-`node.kubernetes.io/not-ready` with `tolerationSeconds=300`
-unless the pod configuration provided
-by the user already has a toleration for `node.kubernetes.io/not-ready`.
-Likewise it adds a toleration for
-`node.kubernetes.io/unreachable` with `tolerationSeconds=300`
-unless the pod configuration provided
-by the user already has a toleration for `node.kubernetes.io/unreachable`.
+{{< note >}}
+Kubernetes automatically adds a toleration for
+`node.kubernetes.io/not-ready` and `node.kubernetes.io/unreachable`
+with `tolerationSeconds=300`,
+unless you, or a controller, set those tolerations explictly.

-These automatically-added tolerations ensure that
-the default pod behavior of remaining bound for 5 minutes after one of these
-problems is detected is maintained.
-The two default tolerations are added by the [DefaultTolerationSeconds
-admission controller](https://git.k8s.io/kubernetes/plugin/pkg/admission/defaulttolerationseconds).
+These automatically-added tolerations mean that Pods remain bound to
+Nodes for 5 minutes after one of these problems is detected.
+{{< /note >}}

 [DaemonSet](/docs/concepts/workloads/controllers/daemonset/) pods are created with
 `NoExecute` tolerations for the following taints with no `tolerationSeconds`:
@@ -287,9 +281,8 @@ The node lifecycle controller automatically creates taints corresponding to
 Node conditions with `NoSchedule` effect.
 Similarly the scheduler does not check Node conditions; instead the scheduler checks taints. This assures that Node conditions don't affect what's scheduled onto the Node. The user can choose to ignore some of the Node's problems (represented as Node conditions) by adding appropriate Pod tolerations.

-Starting in Kubernetes 1.8, the DaemonSet controller automatically adds the
-following `NoSchedule` tolerations to all daemons, to prevent DaemonSets from
-breaking.
+The DaemonSet controller automatically adds the following `NoSchedule`
+tolerations to all daemons, to prevent DaemonSets from breaking.

  * `node.kubernetes.io/memory-pressure`
  * `node.kubernetes.io/disk-pressure`
@@ -299,3 +292,10 @@ breaking.

 Adding these tolerations ensures backward compatibility. You can also add
 arbitrary tolerations to DaemonSets.
+
+{{% /capture %}}
+{{% capture whatsnext %}}
+* Read about [out of resource handling](/docs/tasks/administer-cluster/out-of-resource/) and how you can configure it
+* Read about [pod priority](/docs/concepts/configuration/pod-priority-preemption/)
+
+{{% /capture %}}
@@ -93,7 +93,7 @@ hostaliases-pod                0/1       Completed   0          6s        10.200
 The `hosts` file content would look like this:

 ```shell
-kubectl logs hostaliases-pod
+kubectl exec hostaliases-pod -- cat /etc/hosts
 ```

 ```none
@@ -49,8 +49,8 @@ To enable IPv4/IPv6 dual-stack, enable the `IPv6DualStack` [feature gate](/docs/
      * `--feature-gates="IPv6DualStack=true"`
   * kube-controller-manager:
      * `--feature-gates="IPv6DualStack=true"`
-      * `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>` eg. `--cluster-cidr=10.244.0.0/16,fc00::/48`
-      * `--service-cluster-ip-range=<IPv4 CIDR>,<IPv6 CIDR>` eg. `--service-cluster-ip-range=10.0.0.0/16,fd00::/108`
+      * `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>`
+      * `--service-cluster-ip-range=<IPv4 CIDR>,<IPv6 CIDR>`
      * `--node-cidr-mask-size-ipv4|--node-cidr-mask-size-ipv6` defaults to /24 for IPv4 and /64 for IPv6
   * kubelet:
      * `--feature-gates="IPv6DualStack=true"`
@@ -58,6 +58,13 @@ To enable IPv4/IPv6 dual-stack, enable the `IPv6DualStack` [feature gate](/docs/
      * `--cluster-cidr=<IPv4 CIDR>,<IPv6 CIDR>`
      * `--feature-gates="IPv6DualStack=true"`

+{{< note >}}
+An example of an IPv4 CIDR: `10.244.0.0/16` (though you would supply your own address range)
+
+An example of an IPv6 CIDR: `fdXY:IJKL:MNOP:15::/64` (this shows the format but is not a valid address - see [RFC 4193](https://tools.ietf.org/html/rfc4193))
+
+{{< /note >}}
+
 ## Services

 If your cluster has IPv4/IPv6 dual-stack networking enabled, you can create {{< glossary_tooltip text="Services" term_id="service" >}} with either an IPv4 or an IPv6 address. You can choose the address family for the Service's cluster IP by setting a field, `.spec.ipFamily`, on that Service.
@@ -2,11 +2,6 @@
 reviewers:
 - freehan
 title: EndpointSlices
-feature:
-  title: EndpointSlices
-  description: >
-    Scalable tracking of network endpoints in a Kubernetes cluster.
-
 content_template: templates/concept
 weight: 15
 ---
@@ -311,8 +311,8 @@ these are:
 - `nq`: never queue

 {{< note >}}
-To run kube-proxy in IPVS mode, you must make the IPVS Linux available on
-the node before you starting kube-proxy.
+To run kube-proxy in IPVS mode, you must make IPVS available on
+the node before starting kube-proxy.

 When kube-proxy starts in IPVS proxy mode, it verifies whether IPVS
 kernel modules are available. If the IPVS kernel modules are not detected, then kube-proxy
@@ -692,6 +692,15 @@ metadata:
 [...]
 ```
 {{% /tab %}}
+{{% tab name="Alibaba Cloud" %}}
+```yaml
+[...]
+metadata:
+  annotations:  
+    service.beta.kubernetes.io/alibaba-cloud-loadbalancer-address-type: "intranet"
+[...]
+```
+{{% /tab %}}
 {{< /tabs >}}


@@ -896,7 +905,7 @@ the NLB Target Group's health check on the auto-assigned
 `.spec.healthCheckNodePort` and not receive any traffic.

 In order to achieve even traffic, either use a DaemonSet or specify a
-[pod anti-affinity](/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity)
+[pod anti-affinity](/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity)
 to not locate on the same node.

 You can also use NLB Services with the [internal load balancer](/docs/concepts/services-networking/service/#internal-load-balancer)
@@ -169,9 +169,9 @@ will delay the binding and provisioning of a PersistentVolume until a Pod using
 PersistentVolumes will be selected or provisioned conforming to the topology that is
 specified by the Pod's scheduling constraints. These include, but are not limited to, [resource
 requirements](/docs/concepts/configuration/manage-compute-resources-container),
-[node selectors](/docs/concepts/configuration/assign-pod-node/#nodeselector),
+[node selectors](/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector),
 [pod affinity and
-anti-affinity](/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity),
+anti-affinity](/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity),
 and [taints and tolerations](/docs/concepts/configuration/taint-and-toleration).

 The following plugins support `WaitForFirstConsumer` with dynamic provisioning:
@@ -305,6 +305,11 @@ A Container using a ConfigMap as a [subPath](#using-subpath) volume mount will n
 receive ConfigMap updates.
 {{< /note >}}

+{{< note >}}
+Text data is exposed as files using the UTF-8 character encoding. To use some other character encoding, use binaryData.
+{{< /note >}}
+
+
 ### downwardAPI {#downwardapi}

 A `downwardAPI` volume is used to make downward API data available to applications.
@@ -99,8 +99,8 @@ create a Pod with a different value on a node for testing.

 If you specify a `.spec.template.spec.nodeSelector`, then the DaemonSet controller will
 create Pods on nodes which match that [node
-selector](/docs/concepts/configuration/assign-pod-node/). Likewise if you specify a `.spec.template.spec.affinity`,
-then DaemonSet controller will create Pods on nodes which match that [node affinity](/docs/concepts/configuration/assign-pod-node/).
+selector](/docs/concepts/scheduling-eviction/assign-pod-node/). Likewise if you specify a `.spec.template.spec.affinity`,
+then DaemonSet controller will create Pods on nodes which match that [node affinity](/docs/concepts/scheduling-eviction/assign-pod-node/).
 If you do not specify either, then the DaemonSet controller will create Pods on all nodes.

 ## How Daemon Pods are Scheduled
@@ -1081,6 +1081,15 @@ the default value.

 All existing Pods are killed before new ones are created when `.spec.strategy.type==Recreate`.

+{{< note >}}
+This will only guarantee Pod termination previous to creation for upgrades. If you upgrade a Deployment, all Pods 
+of the old revision will be terminated immediately. Successful removal is awaited before any Pod of the new 
+revision is created. If you manually delete a Pod, the lifecycle is controlled by the ReplicaSet and the 
+replacement will be created immediately (even if the old Pod is still in a Terminating state). If you need an 
+"at most" guarantee for your Pods, you should consider using a 
+[StatefulSet](/docs/concepts/workloads/controllers/statefulset/).
+{{< /note >}}
+
 #### Rolling Update Deployment

 The Deployment updates Pods in a rolling update
@@ -330,7 +330,7 @@ Alternatively, you can use the `kubectl autoscale` command to accomplish the sam
 (and it's easier!)

 ```shell
-kubectl autoscale rs frontend --max=10
+kubectl autoscale rs frontend --max=10 --min=3 --cpu-percent=50
 ```

 ## Alternatives to ReplicaSet
@@ -97,6 +97,8 @@ time as frequent voluntary disruptions.  We call this set of features

 ## How Disruption Budgets Work

+{{< feature-state for_k8s_version="v1.5" state="beta" >}}
+
 An Application Owner can create a `PodDisruptionBudget` object (PDB) for each application.
 A PDB limits the number of pods of a replicated application that are down simultaneously from
 voluntary disruptions.  For example, a quorum-based application would
@@ -211,7 +213,7 @@ state:

 |    node-1 *drained*  |       node-2        |       node-3       | *no node*          |
 |:--------------------:|:-------------------:|:------------------:|:------------------:|
-|                      | pod-b *available*   | pod-c *available*  | pod-e *pending*    |
+|                      | pod-b *terminating* | pod-c *available*  | pod-e *pending*    |
 |                      | pod-d *available*   | pod-y              |                    |

 At this point, the cluster administrator needs to
@@ -46,8 +46,8 @@ including resource limits, volumes, and security settings. However, the
 resource requests and limits for an init container are handled differently,
 as documented in [Resources](#resources).

-Also, init containers do not support readiness probes because they must run to
-completion before the Pod can be ready.
+Also, init containers do not support `lifecycle`, `livenessProbe`, `readinessProbe`, or
+`startupProbe` because they must run to completion before the Pod can be ready.

 If you specify multiple init containers for a Pod, Kubelet runs each init
 container sequentially. Each init container must succeed before the next can run.
@@ -7,6 +7,8 @@ weight: 50
 ---

 {{% capture overview %}}
+{{< feature-state for_k8s_version="v1.6" state="alpha" >}}
+
 This page provides an overview of PodPresets, which are objects for injecting
 certain information into pods at creation time. The information can include
 secrets, volumes, volume mounts, and environment variables.
@@ -14,20 +16,38 @@ secrets, volumes, volume mounts, and environment variables.


 {{% capture body %}}
-## Understanding Pod Presets
+## Understanding Pod presets

-A `Pod Preset` is an API resource for injecting additional runtime requirements
+A PodPreset is an API resource for injecting additional runtime requirements
 into a Pod at creation time.
 You use [label selectors](/docs/concepts/overview/working-with-objects/labels/#label-selectors)
-to specify the Pods to which a given Pod Preset applies.
+to specify the Pods to which a given PodPreset applies.

-Using a Pod Preset allows pod template authors to not have to explicitly provide
+Using a PodPreset allows pod template authors to not have to explicitly provide
 all information for every pod. This way, authors of pod templates consuming a
 specific service do not need to know all the details about that service.

-For more information about the background, see the [design proposal for PodPreset](https://git.k8s.io/community/contributors/design-proposals/service-catalog/pod-preset.md).

-## How It Works
+## Enable PodPreset in your cluster {#enable-pod-preset}
+
+In order to use Pod presets in your cluster you must ensure the following:
+
+1.  You have enabled the API type `settings.k8s.io/v1alpha1/podpreset`. For
+    example, this can be done by including `settings.k8s.io/v1alpha1=true` in
+    the `--runtime-config` option for the API server. In minikube add this flag
+    `--extra-config=apiserver.runtime-config=settings.k8s.io/v1alpha1=true` while
+    starting the cluster.
+1.  You have enabled the admission controller `PodPreset`. One way to doing this
+    is to include `PodPreset` in the `--enable-admission-plugins` option value specified
+    for the API server. In minikube, add this flag
+    
+    ```shell
+    --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,PodPreset
+    ```
+    
+    while starting the cluster.
+
+## How it works

 Kubernetes provides an admission controller (`PodPreset`) which, when enabled,
 applies Pod Presets to incoming pod creation requests.
@@ -62,31 +82,12 @@ There may be instances where you wish for a Pod to not be altered by any Pod
 Preset mutations. In these cases, you can add an annotation in the Pod Spec
 of the form: `podpreset.admission.kubernetes.io/exclude: "true"`.

-## Enable Pod Preset
-
-In order to use Pod Presets in your cluster you must ensure the following:
-
-1.  You have enabled the API type `settings.k8s.io/v1alpha1/podpreset`. For
-    example, this can be done by including `settings.k8s.io/v1alpha1=true` in
-    the `--runtime-config` option for the API server. In minikube add this flag
-    `--extra-config=apiserver.runtime-config=settings.k8s.io/v1alpha1=true` while
-    starting the cluster.
-1.  You have enabled the admission controller `PodPreset`. One way to doing this
-    is to include `PodPreset` in the `--enable-admission-plugins` option value specified
-    for the API server. In minikube add this flag
-    
-    ```shell
-    --extra-config=apiserver.enable-admission-plugins=NamespaceLifecycle,LimitRanger,ServiceAccount,DefaultStorageClass,DefaultTolerationSeconds,NodeRestriction,MutatingAdmissionWebhook,ValidatingAdmissionWebhook,ResourceQuota,PodPreset
-    ```
-    
-    while starting the cluster.
-1.  You have defined your Pod Presets by creating `PodPreset` objects in the
-    namespace you will use.
-
 {{% /capture %}}

 {{% capture whatsnext %}}

-* [Injecting data into a Pod using PodPreset](/docs/tasks/inject-data-application/podpreset/)
+See [Injecting data into a Pod using PodPreset](/docs/tasks/inject-data-application/podpreset/)
+
+For more information about the background, see the [design proposal for PodPreset](https://git.k8s.io/community/contributors/design-proposals/service-catalog/pod-preset.md).

 {{% /capture %}}
@@ -35,7 +35,7 @@ The PR wrangler’s duties include:
    - Assign relevant `sig/` label(s).
    - If needed, assign reviewers from the `reviewers:` block in the file's front matter.
    - Assign `Docs Review` and `Tech Review` labels to indicate the PR's review status.
-    - Assign`Needs Doc Review` or `Needs Tech Review` for PRs that haven't yet been reviewed.
+    - Assign `Needs Doc Review` or `Needs Tech Review` for PRs that haven't yet been reviewed.
    - Assign `Doc Review: Open Issues` or `Tech Review: Open Issues` for PRs that have been reviewed and require further input or action before merging.
    - Assign `/lgtm` and `/approve` labels to PRs that can be merged.
 - Merge PRs when they are ready, or close PRs that shouldn’t be accepted.
@@ -43,7 +43,7 @@ The PR wrangler’s duties include:

 ### Helpful GitHub queries for wranglers

-The following queries are helpful when wrangling. After working through these three queries, the remaining list of PRs to be
+The following queries are helpful when wrangling. After working through these queries, the remaining list of PRs to be
 reviewed is usually small. These queries specifically exclude localization PRs, and only include the `master` branch (except for the last one).

 - [No CLA, not eligible to merge](https://github.com/kubernetes/website/pulls?q=is%3Aopen+is%3Apr+label%3A%22cncf-cla%3A+no%22+-label%3Ado-not-merge+label%3Alanguage%2Fen):
@@ -245,4 +245,4 @@ When you’re ready to stop recording, click Stop.

 The video uploads automatically to YouTube.

-{{% /capture %}}
+{{% /capture %}}
@@ -250,7 +250,7 @@ for more details.

 This plug-in facilitates creation of dedicated nodes with extended resources.
 If operators want to create dedicated nodes with extended resources (like GPUs, FPGAs etc.), they are expected to
-[taint the node](/docs/concepts/configuration/taint-and-toleration/#example-use-cases) with the extended resource
+[taint the node](/docs/concepts/scheduling-eviction/taint-and-toleration/#example-use-cases) with the extended resource
 name as the key. This admission controller, if enabled, automatically
 adds tolerations for such taints to pods requesting extended resources, so users don't have to manually
 add these tolerations.
@@ -114,6 +114,8 @@ different Kubernetes components.
 | `MountContainers` | `false` | Alpha | 1.9 | |
 | `NodeDisruptionExclusion` | `false` | Alpha | 1.16 | |
 | `NonPreemptingPriority` | `false` | Alpha | 1.15 | |
+| `PodDisruptionBudget` | `false` | Alpha | 1.3 | 1.4 |
+| `PodDisruptionBudget` | `true` | Beta | 1.5 | |
 | `PodOverhead` | `false` | Alpha | 1.16 | - |
 | `ProcMountType` | `false` | Alpha | 1.12 | |
 | `QOSReserved` | `false` | Alpha | 1.11 | |
@@ -333,7 +335,7 @@ Each feature gate is designed for enabling/disabling a specific feature:

 - `Accelerators`: Enable Nvidia GPU support when using Docker
 - `AdvancedAuditing`: Enable [advanced auditing](/docs/tasks/debug-application-cluster/audit/#advanced-audit)
- `AffinityInAnnotations`(*deprecated*): Enable setting [Pod affinity or anti-affinity](/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity).
+- `AffinityInAnnotations`(*deprecated*): Enable setting [Pod affinity or anti-affinity](/docs/concepts/scheduling-eviction/assign-pod-node/#affinity-and-anti-affinity).
 - `AllowExtTrafficLocalEndpoints`: Enable a service to route external requests to node local endpoints.
 - `AnyVolumeDataSource`: Enable use of any custom resource as the `DataSource` of a
  {{< glossary_tooltip text="PVC" term_id="persistent-volume-claim" >}}.
@@ -441,6 +443,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
 - `NonPreemptingPriority`: Enable NonPreempting option for PriorityClass and Pod.
 - `PersistentLocalVolumes`: Enable the usage of `local` volume type in Pods.
  Pod affinity has to be specified if requesting a `local` volume.
+- `PodDisruptionBudget`: Enable the [PodDisruptionBudget](/docs/tasks/run-application/configure-pdb/) feature.
 - `PodOverhead`: Enable the [PodOverhead](/docs/concepts/configuration/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/).
 - `PodReadinessGates`: Enable the setting of `PodReadinessGate` field for extending
@@ -486,7 +489,7 @@ Each feature gate is designed for enabling/disabling a specific feature:
 - `Sysctls`: Enable support for namespaced kernel parameters (sysctls) that can be set for each pod.
  See [sysctls](/docs/tasks/administer-cluster/sysctl-cluster/) for more details.
 - `TaintBasedEvictions`: Enable evicting pods from nodes based on taints on nodes and tolerations on Pods.
-  See [taints and tolerations](/docs/concepts/configuration/taint-and-toleration/) for more details.
+  See [taints and tolerations](/docs/concepts/scheduling-eviction/taint-and-toleration/) for more details.
 - `TaintNodesByCondition`: Enable automatic tainting nodes based on [node conditions](/docs/concepts/architecture/nodes/#condition).
 - `TokenRequest`: Enable the `TokenRequest` endpoint on service account resources.
 - `TokenRequestProjection`: Enable the injection of service account tokens into
@@ -96,7 +96,7 @@ kubelet [flags]
      <td colspan="2">--authorization-mode string</td>
    </tr>
    <tr>
-      <td></td><td style="line-height: 130%; word-wrap: break-word;">Authorization mode for Kubelet server. Valid options are AlwaysAllow or Webhook. Webhook mode uses the SubjectAccessReview API to determine authorization. (default "AlwaysAllow") (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.)</td>
+      <td></td><td style="line-height: 130%; word-wrap: break-word;">Authorization mode for Kubelet server. Valid options are AlwaysAllow or Webhook. Webhook mode uses the SubjectAccessReview API to determine authorization. (default "AlwaysAllow" when --config flag is not provided; "Webhook" when --config flag presents.) (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag. See https://kubernetes.io/docs/tasks/administer-cluster/kubelet-config-file/ for more information.)</td>
    </tr>

    <tr>
@@ -15,3 +15,5 @@ tags:
 <!--more--> 

 A worker node may be a VM or physical machine, depending on the cluster. It has local daemons or services necessary to run {{< glossary_tooltip text="Pods" term_id="pod" >}} and is managed by the control plane. The daemons on a node include {{< glossary_tooltip text="kubelet" term_id="kubelet" >}}, {{< glossary_tooltip text="kube-proxy" term_id="kube-proxy" >}}, and a container runtime implementing the {{< glossary_tooltip text="CRI" term_id="cri" >}} such as {{< glossary_tooltip term_id="docker" >}}.
+
+In early Kubernetes versions, Nodes were called “Minions”.
@@ -2,7 +2,7 @@
 title: Taint
 id: taint
 date: 2019-01-11
-full_link: /docs/concepts/configuration/taint-and-toleration/
+full_link: /docs/concepts/scheduling-eviction/taint-and-toleration/
 short_description: >
  A core object consisting of three required properties: key, value, and effect. Taints prevent the scheduling of pods on nodes or node groups.

@@ -2,7 +2,7 @@
 title: Toleration
 id: toleration
 date: 2019-01-11
-full_link: /docs/concepts/configuration/taint-and-toleration/
+full_link: /docs/concepts/scheduling-eviction/taint-and-toleration/
 short_description: >
  A core object consisting of three required properties: key, value, and effect. Tolerations enable the scheduling of pods on nodes or node groups that have a matching taint.

@@ -91,7 +91,7 @@ Operation       | Syntax    |       Description
 `port-forward`    | `kubectl port-forward POD [LOCAL_PORT:]REMOTE_PORT [...[LOCAL_PORT_N:]REMOTE_PORT_N] [flags]` | Forward one or more local ports to a pod.
 `proxy`        | `kubectl proxy [--port=PORT] [--www=static-dir] [--www-prefix=prefix] [--api-prefix=prefix] [flags]` | Run a proxy to the Kubernetes API server.
 `replace`        | `kubectl replace -f FILENAME` | Replace a resource from a file or stdin.
-`run`        | `kubectl run NAME --image=image [--env="key=value"] [--port=port] [--replicas=replicas] [--dry-run=server|client|none] [--overrides=inline-json] [flags]` | Run a specified image on the cluster.
+`run`        | <code>kubectl run NAME --image=image [--env="key=value"] [--port=port] [--dry-run=server&#124;client&#124;none] [--overrides=inline-json] [flags]</code> | Run a specified image on the cluster.
 `scale`        | <code>kubectl scale (-f FILENAME &#124; TYPE NAME &#124; TYPE/NAME) --replicas=COUNT [--resource-version=version] [--current-replicas=count] [flags]</code> | Update the size of the specified replication controller.
 `version`        | `kubectl version [--client] [flags]` | Display the Kubernetes version running on the client and server.

@@ -243,8 +243,8 @@ kubectl get pods <pod-name> --server-print=false
 Output looks like this:

 ```shell
-NAME       READY     STATUS              RESTARTS   AGE
-pod-name   1/1       Running             0          1m
+NAME       AGE
+pod-name   1m
 ```

 ### Sorting list objects
@@ -339,8 +339,8 @@ the pods running on it, the events generated for the node etc.
 # Delete a pod using the type and name specified in the pod.yaml file.
 kubectl delete -f pod.yaml

-# Delete all the pods and services that have the label name=<label-name>.
-kubectl delete pods,services -l name=<label-name>
+# Delete all the pods and services that have the label '<label-key>=<label-value>'.
+kubectl delete pods,services -l <label-key>=<label-value>

 # Delete all pods, including uninitialized ones.
 kubectl delete pods --all
@@ -350,13 +350,13 @@ kubectl delete pods --all

 ```shell
 # Get output from running 'date' from pod <pod-name>. By default, output is from the first container.
-kubectl exec <pod-name> date
+kubectl exec <pod-name> -- date

 # Get output from running 'date' in container <container-name> of pod <pod-name>.
-kubectl exec <pod-name> -c <container-name> date
+kubectl exec <pod-name> -c <container-name> -- date

 # Get an interactive TTY and run /bin/bash from pod <pod-name>. By default, output is from the first container.
-kubectl exec -ti <pod-name> /bin/bash
+kubectl exec -ti <pod-name> -- /bin/bash
 ```

 `kubectl logs` - Print the logs for a container in a pod.
@@ -451,7 +451,7 @@ cat ./kubectl-whoami

 # this plugin makes use of the `kubectl config` command in order to output
 # information about the current user, based on the currently selected context
-kubectl config view --template='{{ range .contexts }}{{ if eq .name "'$(kubectl config current-context)'" }}Current user: {{ .context.user }}{{ end }}{{ end }}'
+kubectl config view --template='{{ range .contexts }}{{ if eq .name "'$(kubectl config current-context)'" }}Current user: {{ printf "%s\n" .context.user }}{{ end }}{{ end }}'
 ```

 Running the above plugin gives us an output containing the user for the currently selected
@@ -77,7 +77,7 @@ The following *priorities* implement scoring:
   {{< glossary_tooltip term_id="replica-set" >}}.

 - `InterPodAffinityPriority`: Implements preferred
-  [inter pod affininity and antiaffinity](/docs/concepts/configuration/assign-pod-node/#inter-pod-affinity-and-anti-affinity).
+  [inter pod affininity and antiaffinity](/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity).

 - `LeastRequestedPriority`: Favors nodes with fewer requested resources. In other
  words, the more Pods that are placed on a Node, and the more resources those
@@ -97,7 +97,7 @@ The following *priorities* implement scoring:

 - `NodeAffinityPriority`: Prioritizes nodes according to node affinity scheduling
   preferences indicated in PreferredDuringSchedulingIgnoredDuringExecution.
-   You can read more about this in [Assigning Pods to Nodes](/docs/concepts/configuration/assign-pod-node/).
+   You can read more about this in [Assigning Pods to Nodes](/docs/concepts/scheduling-eviction/assign-pod-node/).

 - `TaintTolerationPriority`: Prepares the priority list for all the nodes, based on
  the number of intolerable taints on the node. This policy adjusts a node's rank
@@ -68,7 +68,7 @@ extension points:
  Pod runs.
  Extension points: `Score`.
 - `TaintToleration`: Implements
-  [taints and tolerations](/docs/concepts/configuration/taint-and-toleration/).
+  [taints and tolerations](/docs/concepts/scheduling-eviction/taint-and-toleration/).
  Implements extension points: `Filter`, `Prescore`, `Score`.
 - `NodeName`: Checks if a Pod spec node name matches the current node.
  Extension points: `Filter`.
@@ -79,8 +79,8 @@ extension points:
  `scheduler.alpha.kubernetes.io/preferAvoidPods`.
  Extension points: `Score`.
 - `NodeAffinity`: Implements
-  [node selectors](/docs/concepts/configuration/assign-pod-node/#nodeselector)
-  and [node affinity](/docs/concepts/configuration/assign-pod-node/#node-affinity).
+  [node selectors](/docs/concepts/scheduling-eviction/assign-pod-node/#nodeselector)
+  and [node affinity](/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity).
  Extension points: `Filter`, `Score`.
 - `PodTopologySpread`: Implements
  [Pod topology spread](/docs/concepts/workloads/pods/pod-topology-spread-constraints/).
@@ -117,7 +117,7 @@ extension points:
  the node.
  Extension points: `Filter`.
 - `InterPodAffinity`: Implements
-  [inter-Pod affinity and anti-affinity](/docs/concepts/configuration/assign-pod-node/#inter-pod-affinity-and-anti-affinity).
+  [inter-Pod affinity and anti-affinity](/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity).
  Extension points: `PreFilter`, `Filter`, `PreScore`, `Score`.
 - `PrioritySort`: Provides the default priority based sorting.
  Extension points: `QueueSort`.
@@ -81,12 +81,12 @@ The user can skip specific preflight checks or all of them with the `--ignore-pr
 - [warning] If the Kubernetes version to use (specified with the `--kubernetes-version` flag) is at least one minor version higher than the kubeadm CLI version.
 - Kubernetes system requirements:
  - if running on linux:
-    - [error] if not Kernel 3.10+ or 4+ with specific KernelSpec
+    - [error] if Kernel is older than the minimum required version
    - [error] if required cgroups subsystem aren't in set up
  - if using docker:
    - [warning/error] if Docker service does not exist, if it is disabled, if it is not active.
    - [error] if Docker endpoint does not exist or does not work
-    - [warning] if docker version >17.03
+    - [warning] if docker version is not in the list of validated docker versions
  - If using other cri engine:
    - [error] if crictl socket does not answer
 - [error] if user is not root
@@ -108,7 +108,7 @@ The user can skip specific preflight checks or all of them with the `--ignore-pr
 - [warning] if connection to services subnet goes through proxy (only first address checked)
 - [warning] if connection to Pods subnet goes through proxy (only first address checked)
 - If external etcd is provided:
-  - [Error] if etcd version less than 3.0.14
+  - [Error] if etcd version is older than the minimum required version
  - [Error] if etcd certificates or keys are specified, but not provided
 - If external etcd is NOT provided (and thus local etcd will be installed):
  - [Error] if ports 2379 is used
@@ -109,6 +109,7 @@ To mitigate the impact of short history window, we introduced a concept of `book
 `Bookmark` events can be requested by `allowWatchBookmarks=true` option in watch requests, but clients shouldn't assume bookmarks are returned at any specific interval, nor may they assume the server will send any `bookmark` event.

 ## Retrieving large results sets in chunks
+{{< feature-state for_k8s_version="v1.9" state="beta" >}}

 On large clusters, retrieving the collection of some resource types may result in very large responses that can impact the server and client. For instance, a cluster may have tens of thousands of pods, each of which is 1-2kb of encoded JSON. Retrieving all pods across all namespaces may result in a very large response (10-20MB) and consume a large amount of server resources. Starting in Kubernetes 1.9 the server supports the ability to break a single large collection request into many smaller chunks while preserving the consistency of the total request. Each chunk can be returned sequentially which reduces both the total size of the request and allows user-oriented clients to display results incrementally to improve responsiveness.

@@ -15,15 +15,15 @@ The lifecycle of the kubeadm CLI tool is decoupled from the
 on each node within the Kubernetes cluster. The kubeadm CLI tool is executed by the user when Kubernetes is
 initialized or upgraded, whereas the kubelet is always running in the background.

-Since the kubelet is a daemon, it needs to be maintained by some kind of a init
+Since the kubelet is a daemon, it needs to be maintained by some kind of an init
 system or service manager. When the kubelet is installed using DEBs or RPMs,
 systemd is configured to manage the kubelet. You can use a different service
 manager instead, but you need to configure it manually.

 Some kubelet configuration details need to be the same across all kubelets involved in the cluster, while
-other configuration aspects need to be set on a per-kubelet basis, to accommodate the different
-characteristics of a given machine, such as OS, storage, and networking. You can manage the configuration
-of your kubelets manually, but [kubeadm now provides a `KubeletConfiguration` API type for managing your
+other configuration aspects need to be set on a per-kubelet basis to accommodate the different
+characteristics of a given machine (such as OS, storage, and networking). You can manage the configuration
+of your kubelets manually, but kubeadm now provides a `KubeletConfiguration` API type for [managing your
 kubelet configurations centrally](#configure-kubelets-using-kubeadm).

 {{% /capture %}}
@@ -67,7 +67,7 @@ For more details on the ComponentConfig have a look at [this section](#configure

 ### Providing instance-specific configuration details

-Some hosts require specific kubelet configurations, due to differences in hardware, operating system,
+Some hosts require specific kubelet configurations due to differences in hardware, operating system,
 networking, or other host-specific parameters. The following list provides a few examples.

 - The path to the DNS resolution file, as specified by the `--resolv-conf` kubelet
@@ -79,7 +79,7 @@ networking, or other host-specific parameters. The following list provides a few
  unless you are using a cloud provider. You can use the `--hostname-override` flag to override the
  default behavior if you need to specify a Node name different from the machine's hostname.

- Currently, the kubelet cannot automatically detects the cgroup driver used by the CRI runtime,
+- Currently, the kubelet cannot automatically detect the cgroup driver used by the CRI runtime,
  but the value of `--cgroup-driver` must match the cgroup driver used by the CRI runtime to ensure
  the health of the kubelet.

@@ -107,7 +107,7 @@ for more information on the individual fields.

 When you call `kubeadm init`, the kubelet configuration is marshalled to disk
 at `/var/lib/kubelet/config.yaml`, and also uploaded to a ConfigMap in the cluster. The ConfigMap
-is named `kubelet-config-1.X`, where `.X` is the minor version of the Kubernetes version you are
+is named `kubelet-config-1.X`, where `X` is the minor version of the Kubernetes version you are
 initializing. A kubelet configuration file is also written to `/etc/kubernetes/kubelet.conf` with the
 baseline cluster-wide configuration for all kubelets in the cluster. This configuration file
 points to the client certificates that allow the kubelet to communicate with the API server. This
@@ -157,12 +157,12 @@ has finished performing the TLS Bootstrap.

 ##  The kubelet drop-in file for systemd

-kubeadm ships with configuration for how systemd should run the kubelet. 
+`kubeadm` ships with configuration for how systemd should run the kubelet.
 Note that the kubeadm CLI command never touches this drop-in file.

-This configuration file installed by the `kubeadm` [DEB](https://github.com/kubernetes/kubernetes/blob/master/build/debs/10-kubeadm.conf) or [RPM package](https://github.com/kubernetes/kubernetes/blob/master/build/rpms/10-kubeadm.conf) is written to
+This configuration file installed by the `kubeadm` [DEB](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubeadm/10-kubeadm.conf) or [RPM package](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/rpm/kubeadm/10-kubeadm.conf) is written to
 `/etc/systemd/system/kubelet.service.d/10-kubeadm.conf` and is used by systemd.
-It augments the basic [`kubelet.service` for RPM](https://github.com/kubernetes/kubernetes/blob/master/build/rpms/kubelet.service) (resp. [`kubelet.service` for DEB](https://github.com/kubernetes/kubernetes/blob/master/build/debs/kubelet.service))):
+It augments the basic [`kubelet.service` for RPM](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/rpm/kubelet/kubelet.service) or [`kubelet.service` for DEB](https://github.com/kubernetes/release/blob/master/cmd/kubepkg/templates/latest/deb/kubelet/lib/systemd/system/kubelet.service):

 ```none
 [Service]
@@ -356,7 +356,7 @@ the field will be omitted when marshalling. When the field is omitted, kubeadm a

 There are at least two workarounds:

-1. Use the `node-role.kubernetes.io/master:PreferNoSchedule` taint instead of an empty slice. [Pods will get scheduled on masters](/docs/concepts/configuration/taint-and-toleration/), unless other nodes have capacity.
+1. Use the `node-role.kubernetes.io/master:PreferNoSchedule` taint instead of an empty slice. [Pods will get scheduled on masters](/docs/concepts/scheduling-eviction/taint-and-toleration/), unless other nodes have capacity.

 2. Remove the taint after kubeadm init exits:
 ```bash
@@ -70,7 +70,7 @@ spec:
        - -command
        - "<#code used from https://gist.github.com/wagnerandrade/5424431#> ; $$listener = New-Object System.Net.HttpListener ; $$listener.Prefixes.Add('http://*:80/') ; $$listener.Start() ; $$callerCounts = @{} ; Write-Host('Listening at http://*:80/') ; while ($$listener.IsListening) { ;$$context = $$listener.GetContext() ;$$requestUrl = $$context.Request.Url ;$$clientIP = $$context.Request.RemoteEndPoint.Address ;$$response = $$context.Response ;Write-Host '' ;Write-Host('> {0}' -f $$requestUrl) ;  ;$$count = 1 ;$$k=$$callerCounts.Get_Item($$clientIP) ;if ($$k -ne $$null) { $$count += $$k } ;$$callerCounts.Set_Item($$clientIP, $$count) ;$$ip=(Get-NetAdapter | Get-NetIpAddress); $$header='<html><body><H1>Windows Container Web Server</H1>' ;$$callerCountsString='' ;$$callerCounts.Keys | % { $$callerCountsString+='<p>IP {0} callerCount {1} ' -f $$ip[1].IPAddress,$$callerCounts.Item($$_) } ;$$footer='</body></html>' ;$$content='{0}{1}{2}' -f $$header,$$callerCountsString,$$footer ;Write-Output $$content ;$$buffer = [System.Text.Encoding]::UTF8.GetBytes($$content) ;$$response.ContentLength64 = $$buffer.Length ;$$response.OutputStream.Write($$buffer, 0, $$buffer.Length) ;$$response.Close() ;$$responseStatus = $$response.StatusCode ;Write-Host('< {0}' -f $$responseStatus)  } ; "
     nodeSelector:
-      beta.kubernetes.io/os: windows
+      kubernetes.io/os: windows
 ```

 {{< note >}}
@@ -346,7 +346,7 @@ export KUBECONFIG=$KUBECONFIG:$HOME/.kube/config
 ```
 ### Windows Powershell
 ```shell
-$Env:KUBECONFIG=($Env:KUBECONFIG;$HOME/.kube/config)
+$Env:KUBECONFIG="$Env:KUBECONFIG;$HOME\.kube\config"
 ```

 View configuration information merged from all the files that are now listed
@@ -203,6 +203,17 @@ The output shows the message generated by the backend:

 {{% /capture %}}

+{{% capture cleanup %}}
+
+To delete the Services, enter this command:
+
+    kubectl delete services frontend hello
+
+To delete the Deployments, the ReplicaSets and the Pods that are running the backend and frontend applications, enter this command:
+
+    kubectl delete deployment frontend hello
+
+{{% /capture %}}

 {{% capture whatsnext %}}

@@ -66,7 +66,7 @@ This page shows you how to set up a simple Ingress which routes requests to Serv
 1. Create a Deployment using the following command:

    ```shell
-    kubectl create deployment web --image=gcr.io/google-samples/hello-app:1.0 --port=8080
+    kubectl create deployment web --image=gcr.io/google-samples/hello-app:1.0
    ```

    Output:
@@ -203,7 +203,7 @@ The following file is an Ingress resource that sends traffic to your Service via
 1. Create a v2 Deployment using the following command:

    ```shell
-    kubectl run web2 --image=gcr.io/google-samples/hello-app:2.0 --port=8080
+    kubectl create deployment web2 --image=gcr.io/google-samples/hello-app:2.0
    ```
    Output:
    
@@ -214,7 +214,7 @@ The following file is an Ingress resource that sends traffic to your Service via
 1. Expose the Deployment:

    ```shell
-    kubectl expose deployment web2 --target-port=8080 --type=NodePort
+    kubectl expose deployment web2 --port=8080 --type=NodePort
    ```

    Output: 
@@ -228,7 +228,7 @@ The following file is an Ingress resource that sends traffic to your Service via
 1. Edit the existing `example-ingress.yaml` and add the following lines:  

    ```yaml
-          - path: /v2/*
+          - path: /v2
            backend:
              serviceName: web2
              servicePort: 8080
@@ -20,7 +20,7 @@ in the namespace.

 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}

-Each node in your cluster must have at least 1 CPU.
+Your cluster must have at least 1 CPU available for use to run the task examples.

 {{% /capture %}}

@@ -204,11 +204,7 @@ Because your Container did not specify its own CPU request and limit, it was giv
 [default CPU request and limit](/docs/tasks/administer-cluster/cpu-default-namespace/)
 from the LimitRange.

-At this point, your Container might be running or it might not be running. Recall that a prerequisite
-for this task is that your Nodes have at least 1 CPU. If each of your Nodes has only
-1 CPU, then there might not be enough allocatable CPU on any Node to accommodate a request
-of 800 millicpu. If you happen to be using Nodes with 2 CPU, then you probably have
-enough CPU to accommodate the 800 millicpu request.
+At this point, your Container might be running or it might not be running. Recall that a prerequisite for this task is that your cluster must have at least 1 CPU available for use. If each of your Nodes has only 1 CPU, then there might not be enough allocatable CPU on any Node to accommodate a request of 800 millicpu. If you happen to be using Nodes with 2 CPU, then you probably have enough CPU to accommodate the 800 millicpu request.

 Delete your Pod:

@@ -268,7 +268,8 @@ kubectl get pods
 Production likes to run cattle, so let's create some cattle pods.

 ```shell
-kubectl run cattle --image=k8s.gcr.io/serve_hostname --replicas=5
+kubectl create deployment cattle --image=k8s.gcr.io/serve_hostname
+kubectl scale deployment cattle --replicas=5

 kubectl get deployment
 ```
@@ -189,7 +189,8 @@ This delete is asynchronous, so for a time you will see the namespace in the `Te
    To demonstrate this, let's spin up a simple Deployment and Pods in the `development` namespace.

    ```shell
-    kubectl run snowflake --image=k8s.gcr.io/serve_hostname --replicas=2 -n=development
+    kubectl create deployment snowflake --image=k8s.gcr.io/serve_hostname  -n=development
+    kubectl scale deployment snowflake --replicas=2 -n=development
    ```
    We have just created a deployment whose replica size is 2 that is running the pod called `snowflake` with a basic container that just serves the hostname.
    Note that `kubectl run` creates deployments only on Kubernetes cluster >= v1.2. If you are running older versions, it creates replication controllers instead.
@@ -32,7 +32,7 @@ Having a local cache will help improve the latency in such scenarios.

 * Skipping iptables DNAT and connection tracking will help reduce [conntrack races](https://github.com/kubernetes/kubernetes/issues/56903) and avoid UDP DNS entries filling up conntrack table.

-* Connections from local caching agent to kube-dns servie can be upgraded to TCP. TCP conntrack entries will be removed on connection close in contrast with UDP entries that have to timeout ([default](https://www.kernel.org/doc/Documentation/networking/nf_conntrack-sysctl.txt) `nf_conntrack_udp_timeout` is 30 seconds)
+* Connections from local caching agent to kube-dns service can be upgraded to TCP. TCP conntrack entries will be removed on connection close in contrast with UDP entries that have to timeout ([default](https://www.kernel.org/doc/Documentation/networking/nf_conntrack-sysctl.txt) `nf_conntrack_udp_timeout` is 30 seconds)

 * Upgrading DNS queries from UDP to TCP would reduce tail latency attributed to dropped UDP packets and DNS timeouts usually up to 30s (3 retries + 10s timeout). Since the nodelocal cache listens for UDP DNS queries, applications don't need to be changed.

@@ -173,8 +173,8 @@ to the metadata API, and avoid using provisioning data to deliver secrets.
 ### Controlling which nodes pods may access

 By default, there are no restrictions on which nodes may run a pod.  Kubernetes offers a 
-[rich set of policies for controlling placement of pods onto nodes](/docs/concepts/configuration/assign-pod-node/)
-and the [taint based pod placement and eviction](/docs/concepts/configuration/taint-and-toleration/)
+[rich set of policies for controlling placement of pods onto nodes](/docs/concepts/scheduling-eviction/assign-pod-node/)
+and the [taint based pod placement and eviction](/docs/concepts/scheduling-eviction/taint-and-toleration/)
 that are available to end users. For many clusters use of these policies to separate workloads
 can be a convention that authors adopt or enforce via tooling.

@@ -159,7 +159,7 @@ A pod with the _unsafe_ sysctls will fail to launch on any node which has not
 enabled those two _unsafe_ sysctls explicitly. As with _node-level_ sysctls it
 is recommended to use
 [_taints and toleration_ feature](/docs/reference/generated/kubectl/kubectl-commands/#taint) or
-[taints on nodes](/docs/concepts/configuration/taint-and-toleration/)
+[taints on nodes](/docs/concepts/scheduling-eviction/taint-and-toleration/)
 to schedule those pods onto the right nodes.

 ## PodSecurityPolicy
@@ -18,7 +18,7 @@ allocated as much CPU as it requests.

 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}

-Each node in your cluster must have at least 1 CPU.
+Your cluster must have at least 1 CPU available for use to run the task examples.

 A few of the steps on this page require you to run the
 [metrics-server](https://github.com/kubernetes-incubator/metrics-server)
@@ -122,9 +122,7 @@ Recall that by setting `-cpu "2"`, you configured the Container to attempt to us

 {{< note >}}
 Another possible explanation for the CPU use being below 1.0 is that the Node might not have
-enough CPU resources available. Recall that the prerequisites for this exercise require each of
-your Nodes to have at least 1 CPU. If your Container runs on a Node that has only 1 CPU, the Container
-cannot use more than 1 CPU regardless of the CPU limit specified for the Container.
+enough CPU resources available. Recall that the prerequisites for this exercise require your cluster to have at least 1 CPU available for use. If your Container runs on a Node that has only 1 CPU, the Container cannot use more than 1 CPU regardless of the CPU limit specified for the Container.
 {{< /note >}}

 ## CPU units
@@ -116,5 +116,5 @@ This means that the pod will prefer a node that has a `disktype=ssd` label.

 {{% capture whatsnext %}}
 Learn more about
-[Node Affinity](/docs/concepts/configuration/assign-pod-node/#node-affinity).
+[Node Affinity](/docs/concepts/scheduling-eviction/assign-pod-node/#node-affinity).
 {{% /capture %}}
@@ -154,7 +154,7 @@ spec:
        imagePullPolicy: Always
        name: iis
      nodeSelector:
-        beta.kubernetes.io/os: windows
+        kubernetes.io/os: windows
 ```

 Individual containers in a Pod spec can also specify the desired GMSA credspec using a per-container `securityContext.windowsOptions.gmsaCredentialSpecName` field. For example:
@@ -185,7 +185,7 @@ spec:
          windowsOptions:
            gmsaCredentialSpecName: gmsa-Webapp1
      nodeSelector:
-        beta.kubernetes.io/os: windows
+        kubernetes.io/os: windows
 ```

 As Pod specs with GMSA fields populated (as described above) are applied in a cluster, the following sequence of events take place:
@@ -588,6 +588,10 @@ SPECIAL_TYPE
 If there are some files in the `/etc/config/` directory, they will be deleted.
 {{< /caution >}}

+{{< note >}}
+Text data is exposed as files using the UTF-8 character encoding. To use some other character encoding, use binaryData.
+{{< /note >}}
+
 ### Add ConfigMap data to a specific path in the Volume

 Use the `path` field to specify the desired file path for specific ConfigMap items.
@@ -11,7 +11,7 @@ weight: 80
 {{% capture overview %}}

 A security context defines privilege and access control settings for
-a Pod or Container. Security context settings include:
+a Pod or Container. Security context settings include, but are not limited to:

 * Discretionary Access Control: Permission to access an object, like a file, is based on
 [user ID (UID) and group ID (GID)](https://wiki.archlinux.org/index.php/users_and_groups).
@@ -28,6 +28,12 @@ a Pod or Container. Security context settings include:

 * AllowPrivilegeEscalation: Controls whether a process can gain more privileges than its parent process. This bool directly controls whether the [`no_new_privs`](https://www.kernel.org/doc/Documentation/prctl/no_new_privs.txt) flag gets set on the container process. AllowPrivilegeEscalation is true always when the container is: 1) run as Privileged OR 2) has `CAP_SYS_ADMIN`.

+* readOnlyRootFilesystem: Mounts the container's root filesystem as read-only.
+
+The above bullets are not a complete set of security context settings -- please see 
+[SecurityContext](/docs/reference/generated/kubernetes-api/{{< param "version" >}}/#securitycontext-v1-core) 
+for a comprehensive list.
+
 For more information about security mechanisms in Linux, see
 [Overview of Linux Kernel Security Features](https://www.linux.com/learn/overview-linux-kernel-security-features)

@@ -2,20 +2,23 @@
 reviewers:
 - jessfraz
 title: Inject Information into Pods Using a PodPreset
-min-kubernetes-server-version: v1.10
+min-kubernetes-server-version: v1.6
 content_template: templates/task
 weight: 60
 ---

 {{% capture overview %}}

+{{< feature-state for_k8s_version="v1.6" state="alpha" >}}
+
 This page shows how to use PodPreset objects to inject information like {{< glossary_tooltip text="Secrets" term_id="secret" >}}, volume mounts, and {{< glossary_tooltip text="environment variables" term_id="container-env-variables" >}} into Pods at creation time.

 {{% /capture %}}

 {{% capture prerequisites %}}

-{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
+You need to have a Kubernetes cluster, and the kubectl command-line tool must be configured to communicate with your cluster. If you do not already have a cluster, you can create one using [Minikube](/docs/setup/learning-environment/minikube/).
+Make sure that you have [enabled PodPreset](/docs/concepts/workloads/pods/podpreset/#enable-pod-preset) in your cluster.

 {{% /capture %}}

@@ -6,6 +6,8 @@ weight: 110

 {{% capture overview %}}

+{{< feature-state for_k8s_version="v1.5" state="beta" >}}
+
 This page shows how to limit the number of concurrent disruptions
 that your application experiences, allowing for higher availability
 while permitting the cluster administrator to manage the clusters
@@ -115,7 +115,7 @@ Now, we will see how the autoscaler reacts to increased load.
 We will start a container, and send an infinite loop of queries to the php-apache service (please run it in a different terminal):

 ```shell
-kubectl run --generator=run-pod/v1 -it --rm load-generator --image=busybox /bin/sh
+kubectl run -it --rm load-generator --image=busybox /bin/sh

 Hit enter for command prompt

@@ -341,7 +341,7 @@ nodes. There are lots of ways to setup the profiles though, such as:
 The scheduler is not aware of which profiles are loaded onto which node, so the full set of profiles
 must be loaded onto every node.  An alternative approach is to add a node label for each profile (or
 class of profiles) on the node, and use a
-[node selector](/docs/concepts/configuration/assign-pod-node/) to ensure the Pod is run on a
+[node selector](/docs/concepts/scheduling-eviction/assign-pod-node/) to ensure the Pod is run on a
 node with the required profile.

 ### Restricting profiles with the PodSecurityPolicy
@@ -7,7 +7,7 @@ menu:
    title: "Get Started"
    weight: 10
    post: >
-      <p>Ready to get your hands dirty? Build a simple Kubernetes cluster that runs "Hello World" for Node.js.</p>
+      <p>Ready to get your hands dirty? Build a simple Kubernetes cluster that runs a sample app.</p>
 card:
  name: tutorials
  weight: 10
@@ -15,7 +15,7 @@ card:

 {{% capture overview %}}

-This tutorial shows you how to run a simple Hello World Node.js app
+This tutorial shows you how to run a sample app
 on Kubernetes using [Minikube](/docs/setup/learning-environment/minikube) and Katacoda.
 Katacoda provides a free, in-browser Kubernetes environment.

@@ -27,7 +27,7 @@ You can also follow this tutorial if you've installed [Minikube locally](/docs/t

 {{% capture objectives %}}

-* Deploy a hello world application to Minikube.
+* Deploy a sample application to Minikube.
 * Run the app.
 * View application logs.

@@ -35,13 +35,7 @@ You can also follow this tutorial if you've installed [Minikube locally](/docs/t

 {{% capture prerequisites %}}

-This tutorial provides a container image built from the following files:
-
-{{< codenew language="js" file="minikube/server.js" >}}
-
-{{< codenew language="conf" file="minikube/Dockerfile" >}}
-
-For more information on the `docker build` command, read the [Docker documentation](https://docs.docker.com/engine/reference/commandline/build/).
+This tutorial provides a container image that uses NGINX to echo back all the requests.

 {{% /capture %}}

@@ -166,7 +160,7 @@ Kubernetes [*Service*](/docs/concepts/services-networking/service/).

 5. Katacoda environment only: Note the 5 digit port number displayed opposite to `8080` in services output. This port number is randomly generated and it can be different for you. Type your number in the port number text box, then click Display Port. Using the example from earlier, you would type `30369`.

-    This opens up a browser window that serves your app and shows the "Hello World" message.
+    This opens up a browser window that serves your app and shows the app's response.

 ## Enable addons

@@ -67,7 +67,7 @@ kubectl get pods --namespace=kube-system | grep kube-state

 ```shell
 git clone https://github.com/kubernetes/kube-state-metrics.git kube-state-metrics
-kubectl create -f examples/standard
+kubectl apply -f kube-state-metrics/examples/standard
 kubectl get pods --namespace=kube-system | grep kube-state-metrics
 ```
 Verify that kube-state-metrics is running and ready
@@ -78,7 +78,7 @@ kubectl get pods -n kube-system -l app.kubernetes.io/name=kube-state-metrics
 Output:
 ```shell
 NAME                                 READY   STATUS    RESTARTS   AGE
-kube-state-metrics-89d656bf8-vdthm   2/2     Running     0          21s
+kube-state-metrics-89d656bf8-vdthm   1/1     Running     0          21s
 ```
 ## Clone the Elastic examples GitHub repo
 ```shell
@@ -357,10 +357,14 @@ The output:
 ```shell
 deployment.extensions/frontend scaled
 ```
+Scale the frontend back up to three pods:
+```shell
+kubectl scale --replicas=3 deployment/frontend
+```

 ## View the changes in Kibana
 See the screenshot, add the indicated filters and then add the columns to the view.  You can see the ScalingReplicaSet entry that is marked, following from there to the top of the list of events shows the image being pulled, the volumes mounted, the pod starting, etc.
-![Kibana Discover](https://raw.githubusercontent.com/elastic/examples/master/beats-k8s-send-anywhere/scaling-discover.png)
+![Kibana Discover](https://raw.githubusercontent.com/elastic/examples/master/beats-k8s-send-anywhere/scaling-up.png)

 {{% /capture %}}

@@ -116,7 +116,7 @@ Although the Redis master is a single pod, you can make it highly available to m

 Deployments scale based off of the configurations set in the manifest file. In this case, the Deployment object specifies two replicas.

-If there are not any replicas running, this Deployment would start the two replicas on your container cluster. Conversely, if there are more than two replicas are running, it would scale down until two replicas are running.
+If there are not any replicas running, this Deployment would start the two replicas on your container cluster. Conversely, if there are more than two replicas running, it would scale down until two replicas are running.

 {{< codenew file="application/guestbook/redis-slave-deployment.yaml" >}}