From fb7cca7a2fe9ef91b3cd094d734cb52c575c61c1 Mon Sep 17 00:00:00 2001 From: "xialong.lee" Date: Sat, 10 Dec 2016 13:19:49 +0800 Subject: [PATCH] fix-typo --- docs/admin/dns.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/admin/dns.md b/docs/admin/dns.md index d75acfa093..44dd79b557 100644 --- a/docs/admin/dns.md +++ b/docs/admin/dns.md @@ -60,7 +60,7 @@ of the form `auto-generated-name.my-svc.my-namespace.svc.cluster.local`. ### Backwards compatibility -Previous versions of kube-dns made names of the for +Previous versions of kube-dns made names of the form `my-svc.my-namespace.cluster.local` (the 'svc' level was added later). This is no longer supported. @@ -114,7 +114,7 @@ Given a Pod with the hostname set to "foo" and the subdomain set to "bar", and a With v1.2, the Endpoints object also has a new annotation `endpoints.beta.kubernetes.io/hostnames-map`. Its value is the json representation of map[string(IP)][endpoints.HostRecord], for example: '{"10.245.1.6":{HostName: "my-webserver"}}'. If the Endpoints are for a headless service, an A record is created with the format ...svc. -For the example json, if endpoints are for a headless service named "bar", and one of the endpoints has IP "10.245.1.6", an A is created with the name "my-webserver.bar.my-namespace.svc.cluster.local" and the A record lookup would return "10.245.1.6". +For the example json, if endpoints are for a headless service named "bar", and one of the endpoints has IP "10.245.1.6", an A record is created with the name "my-webserver.bar.my-namespace.svc.cluster.local" and the A record lookup would return "10.245.1.6". This endpoints annotation generally does not need to be specified by end-users, but can used by the internal service controller to deliver the aforementioned feature. With v1.3, The Endpoints object can specify the `hostname` for any endpoint, along with its IP. The hostname field takes precedence over the hostname value