-
Notifications
You must be signed in to change notification settings - Fork 14.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
administer-cluster/coredns: include more changes #8985
Merged
k8s-ci-robot
merged 1 commit into
kubernetes:release-1.11
from
neolit123:administer-cluster-coredns
Jun 11, 2018
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -16,16 +16,29 @@ This page describes the CoreDNS upgrade process and how to install kube-dns inst | |
|
||
{{% capture steps %}} | ||
|
||
## Installing kube-dns with kubeadm | ||
## About CoreDNS | ||
|
||
In Kubernetes 1.11, [CoreDNS](https://coredns.io) has graduated to General Availability (GA) | ||
[CoreDNS](https://coredns.io) is a flexible, extensible DNS server that can serve as the Kubernetes cluster DNS. | ||
Like Kubernetes, the CoreDNS project is hosted by the [CNCF.](http://www.cncf.io) | ||
|
||
You can use CoreDNS instead of kube-dns in your cluster by replacing kube-dns in an existing | ||
deployment, or by using tools like kubeadm that will deploy and upgrade the cluster for you. | ||
|
||
## Installing CoreDNS | ||
|
||
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 | ||
## Upgrading an existing cluster with kubeadm | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. THANK YOU FOR CATCHING! :-) |
||
|
||
In Kubernetes version 1.10 and later, you can also move to CoreDNS when you use `kubeadm` to upgrade | ||
a cluster that is using `kube-dns`. In this case, `kubeadm` will generate the CoreDNS configuration | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Here the way it is presented in the website, one can think the command-line operation is to install CoreDNS whereas it is the opposite. So I propose to detach the 2 sentences.
See below:
In Kubernetes 1.11, CoreDNS has graduated to General Availability (GA)
and is installed by default
In order to NOT install CoreDNS but rather install kube-dns as the cluster's DNS Server, set the
CoreDNS
feature gate value tofalse
:There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry, @fturib -- I see your concern, but the original as @neolit123 has written/edited is completely clear. We don't need the additional words -- they only get in the way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
see inline conversation; keep the original