diff --git a/.changelog/14679.txt b/.changelog/14679.txt new file mode 100644 index 000000000..601fd6c76 --- /dev/null +++ b/.changelog/14679.txt @@ -0,0 +1,3 @@ +```release-note:improvement +dns: **(Enterprise Only)** All enterprise locality labels are now optional in DNS lookups. For example, service lookups support the following format: .].service[..ns][..ap][..dc]`. +``` diff --git a/website/content/docs/agent/config/config-files.mdx b/website/content/docs/agent/config/config-files.mdx index 708489cfc..593ab5237 100644 --- a/website/content/docs/agent/config/config-files.mdx +++ b/website/content/docs/agent/config/config-files.mdx @@ -1344,13 +1344,12 @@ Valid time units are 'ns', 'us' (or 'µs'), 'ms', 's', 'm', 'h'." equivalent to "no max age". To get a fresh value from the cache use a very small value of `1ns` instead of 0. - - `prefer_namespace` ((#dns_prefer_namespace)) **Deprecated in - Consul 1.11. Use the [canonical DNS format](/docs/discovery/dns#namespaced-partitioned-services) instead.** - - When set to true, in a DNS query for a service, the label between the domain - and the `service` label will be treated as a namespace name instead of a datacenter. - When set to false, the default, the behavior will be the same as non-Enterprise - versions and will assume the label is the datacenter. See: [this section](/docs/discovery/dns#namespaced-services) - for more details. + - `prefer_namespace` ((#dns_prefer_namespace)) **Deprecated in Consul 1.11. + Use the [canonical DNS format for enterprise service lookups](/docs/discovery/dns#service-lookups-for-consul-enterprise) instead.** - + When set to true, in a DNS query for a service, a single label between the domain + and the `service` label is treated as a namespace name instead of a datacenter. + When set to false, the default, the behavior is the same as non-Enterprise + versions and treats the single label as the datacenter. - `domain` Equivalent to the [`-domain` command-line flag](/docs/agent/config/cli-flags#_domain). diff --git a/website/content/docs/discovery/dns.mdx b/website/content/docs/discovery/dns.mdx index 4e110f1f6..51c0e97be 100644 --- a/website/content/docs/discovery/dns.mdx +++ b/website/content/docs/discovery/dns.mdx @@ -353,15 +353,8 @@ $ echo -n "20010db800010002cafe000000001337" | perl -ne 'printf join(":", unpack By default, all service lookups use the `default` namespace within the partition and datacenter of the Consul agent that received the DNS query. - -Use the following query format to specify a namespace, partition, and/or datacenter -for all service lookup types except `.query`, -including `.service`, `.connect`, `.virtual`, and `.ingress`. -At least two of those three fields (`namespace`, `partition`, `datacenter`) -must be specified. -```text -[.].service..ns..ap..dc. -``` +To lookup services in another namespace, partition, and/or datacenter, +use the [canonical format](#canonical-format). Consul server agents are in the `default` partition. If DNS queries are addressed to Consul server agents, @@ -369,7 +362,37 @@ service lookups to non-`default` partitions must explicitly specify the partition of the target service. To lookup services imported from a cluster peer, -use a [service virtual IP lookups for Consul Enterprise](#service-virtual-ip-lookups-for-consul-enterprise) instead. +refer to [service virtual IP lookups for Consul Enterprise](#service-virtual-ip-lookups-for-consul-enterprise) instead. + +#### Canonical format + +Use the following query format to specify namespace, partition, and/or datacenter +for all service lookup types except `.query`, +including `.service`, `.connect`, `.virtual`, and `.ingress`. +All three fields (`namespace`, `partition`, `datacenter`) are optional. +```text +[.].service[..ns][..ap][..dc] +``` + +#### Alternative formats for specifying namespace + +Though the [canonical format](#canonical-format) is recommended for readability, +the following query formats may be used to specify namespace-only: + +- Specify namespace and datacenter pair + + ```text + [.].service... + ``` + +- **Deprecated in Consul 1.11:** + Specify namespace-only if DNS queries are addressed to a Consul agent with + [`dns_config.prefer_namespace`](/docs/agent/config/config-files#dns_prefer_namespace) + set to true + + ```text + [.].service.. + ``` ### Prepared Query Lookups