Merge branch 'master' into release-1.12

content/en/docs/tasks/administer-cluster/cluster-management.md

@@ -73,6 +73,7 @@ Different providers, and tools, will manage upgrades differently.  It is recomme
 * [kops](https://github.com/kubernetes/kops)
 * [kubespray](https://github.com/kubernetes-incubator/kubespray)
 * [CoreOS Tectonic](https://coreos.com/tectonic/docs/latest/admin/upgrade.html)
+* [Digital Rebar](https://provision.readthedocs.io/en/tip/doc/content-packages/krib.html)
 * ...
 
 ## Resizing a cluster
@@ -214,4 +215,4 @@ You can use `kubectl convert` command to convert config files between different
 kubectl convert -f pod.yaml --output-version v1
 ```
 
-For more options, please refer to the usage of [kubectl convert](/docs/user-guide/kubectl/{{page.version}}/#convert) command.
+For more options, please refer to the usage of [kubectl convert](/docs/reference/generated/kubectl/kubectl-commands#convert) command.

content/en/docs/tasks/administer-cluster/coredns.md

@@ -7,7 +7,7 @@ content_template: templates/task
 ---
 
 {{% capture overview %}}
-This page describes the CoreDNS upgrade process and how to install kube-dns instead of CoreDNS.
+This page describes the CoreDNS upgrade process and how to install CoreDNS instead of kube-dns.
 {{% /capture %}}
 
 {{% capture prerequisites %}}
@@ -29,15 +29,6 @@ deployment, or by using tools like kubeadm that will deploy and upgrade the clus
 For manual deployment or replacement of kube-dns, see the documentation at the
 [CoreDNS GitHub project.](https://github.com/coredns/deployment/tree/master/kubernetes)
 
-## Installing CoreDNS with kubeadm
-
-In Kubernetes 1.11, CoreDNS has graduated to General Availability (GA)
-and is installed by default. To install kube-dns instead, set the `CoreDNS` feature gate
-value to `false`:
-```
-kubeadm init --feature-gates=CoreDNS=false
-```
-
 ## Upgrading an existing cluster with kubeadm
 
 In Kubernetes version 1.10 and later, you can also move to CoreDNS when you use `kubeadm` to upgrade
@@ -58,6 +49,20 @@ customizations after the new ConfigMap is up and running.
 If you are running CoreDNS in Kubernetes version 1.11 and later, during upgrade,
 your existing Corefile will be retained.
 
+## Installing kube-dns instead of CoreDNS with kubeadm
+
+{{< note >}}
+**Note:** In Kubernetes 1.11, CoreDNS has graduated to General Availability (GA)
+and is installed by default.
+{{< /note >}}
+
+To install kube-dns instead, set the `CoreDNS` feature gate
+value to `false`:
+
+```
+kubeadm init --feature-gates=CoreDNS=false
+```
+
 {{% /capture %}}
 
 {{% capture whatsnext %}}

content/en/docs/tasks/administer-cluster/declare-network-policy.md

@@ -9,22 +9,19 @@ content_template: templates/task
 This document helps you get started using the Kubernetes [NetworkPolicy API](/docs/concepts/services-networking/network-policies/) to declare network policies that govern how pods communicate with each other.
 {{% /capture %}}
 
-{{% capture prerequisites %}}
-You'll need to have a Kubernetes cluster in place, with network policy support. There are a number of network providers that support NetworkPolicy, including:
-
-* [Calico](/docs/tasks/configure-pod-container/calico-network-policy/)
-* [Cilium](/docs/tasks/administer-cluster/cilium-network-policy/)
-* [Kube-router](/docs/tasks/administer-cluster/kube-router-network-policy/)
-* [Romana](/docs/tasks/configure-pod-container/romana-network-policy/)
-* [Weave Net](/docs/tasks/administer-cluster/weave-network-policy/)
-
-**Note**: The above list is sorted alphabetically by product name, not by recommendation or preference. This example is valid for a Kubernetes cluster using any of these providers.
-{{% /capture %}}
-
 {{% capture prerequisites %}}
 
 {{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
 
+Make sure you've configured a network provider with network policy support. There are a number of network providers that support NetworkPolicy, including:
+
+* [Calico](/docs/tasks/administer-cluster/network-policy-provider/calico-network-policy/)
+* [Cilium](/docs/tasks/administer-cluster/network-policy-provider/cilium-network-policy/)
+* [Kube-router](/docs/tasks/administer-cluster/network-policy-provider/kube-router-network-policy/)
+* [Romana](/docs/tasks/administer-cluster/network-policy-provider/romana-network-policy/)
+* [Weave Net](/docs/tasks/administer-cluster/network-policy-provider/weave-network-policy/)
+
+**Note**: The above list is sorted alphabetically by product name, not by recommendation or preference. This example is valid for a Kubernetes cluster using any of these providers.
 {{% /capture %}}
 
 {{% capture steps %}}

content/en/docs/tasks/administer-cluster/dns-custom-nameservers.md

@@ -71,7 +71,8 @@ kind: ConfigMap
 metadata:
   name: coredns
   namespace: kube-system
-Corefile: |
+data:
+  Corefile: |
     .:53 {
         errors
         health
@@ -94,7 +95,7 @@ The Corefile configuration includes the following [plugins](https://coredns.io/p
 * [health](https://coredns.io/plugins/health/): Health of CoreDNS is reported to http://localhost:8080/health.
 * [kubernetes](https://coredns.io/plugins/kubernetes/): CoreDNS will reply to DNS queries based on IP of the services and pods of Kubernetes. You can find more details [here](https://coredns.io/plugins/kubernetes/). 
 
-> The `pods insecure` option is provided for backward compatibility with kube-dns. You can use the `pod verified` option, which returns an A record only if there exists a pod in same namespace with matching IP. The `pods disabled` option can be used if you don't use pod records.
+> The `pods insecure` option is provided for backward compatibility with kube-dns. You can use the `pods verified` option, which returns an A record only if there exists a pod in same namespace with matching IP. The `pods disabled` option can be used if you don't use pod records.
 
 > `Upstream` is used for resolving services that point to external hosts (External Services).
 
@@ -139,7 +140,8 @@ kind: ConfigMap
 metadata:
   name: coredns
   namespace: kube-system
-Corefile: |
+data:
+  Corefile: |
     .:53 {
         errors
         health
@@ -386,4 +388,4 @@ To migrate from kube-dns to CoreDNS, [a detailed blog](https://coredns.io/2018/0
 A cluster administrator can also migrate using [the deploy script](https://github.com/coredns/deployment/blob/master/kubernetes/deploy.sh), which  will also help you translate the kube-dns configmap to the equivalent CoreDNS one.
 
 ## What's next
-- [Debugging DNS Resolution](/docs/tasks/administer-cluster/dns-debugging-resolution/).
+- [Debugging DNS Resolution](/docs/tasks/administer-cluster/dns-debugging-resolution/).

content/en/docs/tasks/administer-cluster/dns-horizontal-autoscaling.md

@@ -18,12 +18,6 @@ Kubernetes cluster.
 
 {{% /capture %}}
 
-{{% capture prerequisites %}}
-
-{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-
-{{% /capture %}}
-
 {{% capture steps %}}
 
 ## Determining whether DNS horizontal autoscaling is already enabled

content/en/docs/tasks/administer-cluster/encrypt-data.md

@@ -17,16 +17,6 @@ This page shows how to enable and configure encryption of secret data at rest.
 
 * etcd v3 or later is required
 
-* Encryption at rest is alpha in 1.7.0 which means it may change without notice. Users may be required to decrypt their data prior to upgrading to 1.8.0.
-
-{{% /capture %}}
-
-{{< toc >}}
-
-{{% capture prerequisites %}}
-
-{{< include "task-tutorial-prereqs.md" >}} {{< version-check >}}
-
 {{% /capture %}}
 
 {{% capture steps %}}

content/en/docs/tasks/administer-cluster/kubeadm/kubeadm-upgrade-ha.md

@@ -150,6 +150,12 @@ Add an annotation for the cri-socket to the current node, for example to use doc
 kubectl annotate node <nodename> kubeadm.alpha.kubernetes.io/cri-socket=/var/run/dockershim.sock
 ```
 
+Apply the modified kubeadm-config on the node:
+
+```shell
+kubectl apply -f kubeadm-config-cm.yaml --force
+```
+
 Start the upgrade:
 
 ```shell
@@ -237,4 +243,4 @@ If the upgrade fails, see whether one of the following scenarios applies:
 
 - If `kubeadm upgrade apply` on one of the secondary masters failed, the cluster is upgraded and working, but the secondary masters are in an undefined state. You need to investigate further and join the secondaries manually.
 
-{{% /capture %}}
+{{% /capture %}}

content/en/docs/tasks/administer-cluster/manage-resources/memory-constraint-namespace.md

@@ -146,7 +146,7 @@ pods "constraints-mem-demo-2" is forbidden: maximum memory usage per Container i
 ## Attempt to create a Pod that does not meet the minimum memory request
 
 Here's the configuration file for a Pod that has one Container. The Container specifies a
-memory request of 200 MiB and a memory limit of 800 MiB.
+memory request of 100 MiB and a memory limit of 800 MiB.
 
 {{< codenew file="admin/resource/memory-constraints-pod-3.yaml" >}}
 

content/en/docs/tasks/administer-cluster/sysctl-cluster.md

@@ -6,7 +6,7 @@ content_template: templates/task
 ---
 
 {{% capture overview %}}
-{{< feature-state for_k8s_version="v1.11" state="beta" >}}
+{{< feature-state for_k8s_version="v1.12" state="beta" >}}
 
 This document describes how to configure and use kernel parameters within a
 Kubernetes cluster using the sysctl interface.