From 4161d158a3609b2e554e1d3fcd31f32da5a207a3 Mon Sep 17 00:00:00 2001 From: John Belamaric Date: Mon, 27 Nov 2017 14:56:44 -0500 Subject: [PATCH 1/5] Initial placeholder PR for CoreDNS feature documentation --- docs/admin/coredns.md | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 docs/admin/coredns.md diff --git a/docs/admin/coredns.md b/docs/admin/coredns.md new file mode 100644 index 0000000000000..b4e66bb75853c --- /dev/null +++ b/docs/admin/coredns.md @@ -0,0 +1,6 @@ +--- +title: Using CoreDNS for Service Discovery +--- + +This document describes how to enable CoreDNS instead of kube-dns for service +discovery. CoreDNS is available as an alpha feature in Kubernetes 1.9. From dd873b81eee1616a3bb48cfcefc0194ca368abcf Mon Sep 17 00:00:00 2001 From: John Belamaric Date: Wed, 6 Dec 2017 19:11:13 -0600 Subject: [PATCH 2/5] Remove from admin, add content --- docs/admin/coredns.md | 6 ---- docs/tasks/administer-cluster/coredns.md | 39 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) delete mode 100644 docs/admin/coredns.md create mode 100644 docs/tasks/administer-cluster/coredns.md diff --git a/docs/admin/coredns.md b/docs/admin/coredns.md deleted file mode 100644 index b4e66bb75853c..0000000000000 --- a/docs/admin/coredns.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -title: Using CoreDNS for Service Discovery ---- - -This document describes how to enable CoreDNS instead of kube-dns for service -discovery. CoreDNS is available as an alpha feature in Kubernetes 1.9. diff --git a/docs/tasks/administer-cluster/coredns.md b/docs/tasks/administer-cluster/coredns.md new file mode 100644 index 0000000000000..ac74c626369fb --- /dev/null +++ b/docs/tasks/administer-cluster/coredns.md @@ -0,0 +1,39 @@ +--- +approvers: +- johnbelamaric +title: Using CoreDNS for Service Discovery +--- + +{% include feature-state-alpha.md %} + +{% capture overview %} +This page describes how to enable CoreDNS instead of kube-dns for service +discovery. +{% endcapture %} + +{% capture prerequisites %} +* Kubernetes version 1.9 and above. +{% endcapture %} + +{% capture steps %} + +## Installing CoreDNS with kubeadm + +In Kubernetes 1.9, [CoreDNS](https://coredns.io) is available as an alpha feature and +may be installed by setting the `CoreDNS` feature gate to `true` during `kubeadm init`: + +``` +kubeadm init --feature-gates=CoreDNS=true +``` + +This will install CoreDNS instead of kube-dns. + +{% capture whatsnext %} + +[CoreDNS](https://coredns.io) may be configured to support many more use cases than +kube-dns by modifying the `Corefile`. See the CoreDNS [site](https://coredns.io) for some +[examples](https://coredns.io/2017/05/08/custom-dns-entries-for-kubernetes/). + +{% endcapture %} + +{% include templates/task.md %} From 133c5220b1a2a7f977821b407ac14737b09a982b Mon Sep 17 00:00:00 2001 From: John Belamaric Date: Wed, 6 Dec 2017 19:13:57 -0600 Subject: [PATCH 3/5] Fix missing endcapture --- docs/tasks/administer-cluster/coredns.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/tasks/administer-cluster/coredns.md b/docs/tasks/administer-cluster/coredns.md index ac74c626369fb..7693da1fb8740 100644 --- a/docs/tasks/administer-cluster/coredns.md +++ b/docs/tasks/administer-cluster/coredns.md @@ -28,6 +28,8 @@ kubeadm init --feature-gates=CoreDNS=true This will install CoreDNS instead of kube-dns. +{% endcapture %} + {% capture whatsnext %} [CoreDNS](https://coredns.io) may be configured to support many more use cases than From f73f67432b6c0a3590e04bb23174b7fac45db7e3 Mon Sep 17 00:00:00 2001 From: John Belamaric Date: Wed, 6 Dec 2017 19:25:00 -0600 Subject: [PATCH 4/5] Add to tasks.yml --- _data/tasks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/_data/tasks.yml b/_data/tasks.yml index 15eb64620b0a4..b7defe6768345 100644 --- a/_data/tasks.yml +++ b/_data/tasks.yml @@ -143,6 +143,7 @@ toc: - docs/tasks/administer-cluster/namespaces.md - docs/tasks/administer-cluster/namespaces-walkthrough.md - docs/tasks/administer-cluster/dns-horizontal-autoscaling.md + - docs/tasks/administer-cluster/coredns.md - docs/tasks/administer-cluster/safely-drain-node.md - docs/tasks/administer-cluster/cpu-memory-limit.md - docs/tasks/administer-cluster/out-of-resource.md From abf3bf74178429d78ebe563f28aeb980a9fe6cbf Mon Sep 17 00:00:00 2001 From: John Belamaric Date: Wed, 6 Dec 2017 22:51:17 -0600 Subject: [PATCH 5/5] Review feedback --- docs/tasks/administer-cluster/coredns.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/docs/tasks/administer-cluster/coredns.md b/docs/tasks/administer-cluster/coredns.md index 7693da1fb8740..ead2e53247a7f 100644 --- a/docs/tasks/administer-cluster/coredns.md +++ b/docs/tasks/administer-cluster/coredns.md @@ -2,6 +2,7 @@ approvers: - johnbelamaric title: Using CoreDNS for Service Discovery +min-kubernetes-server-version: v1.9 --- {% include feature-state-alpha.md %} @@ -12,7 +13,7 @@ discovery. {% endcapture %} {% capture prerequisites %} -* Kubernetes version 1.9 and above. +{% include task-tutorial-prereqs.md %} {% endcapture %} {% capture steps %} @@ -26,15 +27,15 @@ may be installed by setting the `CoreDNS` feature gate to `true` during `kubeadm kubeadm init --feature-gates=CoreDNS=true ``` -This will install CoreDNS instead of kube-dns. +This installs CoreDNS instead of kube-dns. {% endcapture %} {% capture whatsnext %} -[CoreDNS](https://coredns.io) may be configured to support many more use cases than -kube-dns by modifying the `Corefile`. See the CoreDNS [site](https://coredns.io) for some -[examples](https://coredns.io/2017/05/08/custom-dns-entries-for-kubernetes/). +You can configure [CoreDNS](https://coredns.io) to support many more use cases than +kube-dns by modifying the `Corefile`. For more information, see the +[CoreDNS site]https://coredns.io/2017/05/08/custom-dns-entries-for-kubernetes/). {% endcapture %}