update and reorder sub contents (#10112)

This commit is contained in:
makocchi
2018-10-04 11:07:30 +09:00
committed by k8s-ci-robot
parent 9c2f4b7123
commit 20b1dd242d
@@ -7,7 +7,7 @@ content_template: templates/task
--- ---
{{% capture overview %}} {{% 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 %}}
{{% capture prerequisites %}} {{% 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 For manual deployment or replacement of kube-dns, see the documentation at the
[CoreDNS GitHub project.](https://github.com/coredns/deployment/tree/master/kubernetes) [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 ## 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 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, If you are running CoreDNS in Kubernetes version 1.11 and later, during upgrade,
your existing Corefile will be retained. 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 %}}
{{% capture whatsnext %}} {{% capture whatsnext %}}