Skip to content

Commit a1993bf

Browse files
thallgrenthallgren
committed
Fix glitch regarding client.dns config.
Remove text suggesting that only some of the config elements can be configured globally. Signed-off-by: Thomas Hallgren <thomas@tada.se>
1 parent 22b0b3c commit a1993bf

File tree

1 file changed

+16
-16
lines changed
  • versioned_docs/version-2.20/reference

1 file changed

+16
-16
lines changed

‎versioned_docs/version-2.20/reference/config.md‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,28 +45,28 @@ client:
4545
### Cluster
4646
Values for `client.cluster` controls aspects on how client's connection to the traffic-manager.
4747

48-
| Field | Description | Type | Default |
49-
|---------------------------|--------------------------------------------------------------------|---------------------------------------------|--------------------|
50-
| `defaultManagerNamespace` | The default namespace where the Traffic Manager will be installed. | [string][yaml-str] | ambassador |
51-
| `mappedNamespaces` | Namespaces that will be mapped by default. | [sequence][yaml-seq] of [strings][yaml-str] | `[]` |
52-
| `connectFromRootDaeamon` | Make connections to the cluster directly from the root daemon. | [boolean][yaml-bool] | `true` |
53-
| `agentPortForward` | Let telepresence-client use port-forwards directly to agents | [boolean][yaml-bool] | `true` |
54-
| `virtualIPSubnet` | The CIDR to use when generating virtual IPs | [string][yaml-str] | platform dependent |
48+
| Field | Description | Type | Default |
49+
|---------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|--------------------|
50+
| `defaultManagerNamespace` | The default namespace where the Traffic Manager will be installed. This value cannot be configured in the Helm chart, because a connection must be established before the client can reach the config. | [string][yaml-str] | ambassador |
51+
| `mappedNamespaces` | Namespaces that will be mapped by default. | [sequence][yaml-seq] of [strings][yaml-str] | `[]` |
52+
| `connectFromRootDaeamon` | Make connections to the cluster directly from the root daemon. | [boolean][yaml-bool] | `true` |
53+
| `agentPortForward` | Let telepresence-client use port-forwards directly to agents | [boolean][yaml-bool] | `true` |
54+
| `virtualIPSubnet` | The CIDR to use when generating virtual IPs | [string][yaml-str] | platform dependent |
5555

5656
### DNS
5757

5858
The `client.dns` configuration offers options for configuring the DNS resolution behavior in a client application or system. Here is a summary of the available fields:
5959

60-
The fields for `client.dns` are: `localIP`, `excludeSuffixes`, `includeSuffixes`, and `lookupTimeout`.
60+
The fields for `client.dns` are: `localIP`, `excludeSuffixes`, `includeSuffixes`, `excludes`, `mappings`, and `lookupTimeout`.
6161

62-
| Field | Description | Type | Default |
63-
|-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|----------------------------------------------------|
64-
| `localIP` | The address of the local DNS server. This entry is only used on Linux systems that are not configured to use systemd-resolved. | IP address [string][yaml-str] | first `nameserver` mentioned in `/etc/resolv.conf` |
65-
| `excludeSuffixes` | Suffixes for which the DNS resolver will always fail (or fallback in case of the overriding resolver). Can be globally configured in the Helm chart. | [sequence][yaml-seq] of [strings][yaml-str] | `[".arpa", ".com", ".io", ".net", ".org", ".ru"]` |
66-
| `includeSuffixes` | Suffixes for which the DNS resolver will always attempt to do a lookup. Includes have higher priority than excludes. Can be globally configured in the Helm chart. | [sequence][yaml-seq] of [strings][yaml-str] | `[]` |
67-
| `excludes` | Names to be excluded by the DNS resolver | `[]` |
68-
| `mappings` | Names to be resolved to other names (CNAME records) or to explicit IP addresses | `[]` |
69-
| `lookupTimeout` | Maximum time to wait for a cluster side host lookup. | [duration][go-duration] [string][yaml-str] | 4 seconds |
62+
| Field | Description | Type | Default |
63+
|-------------------|---------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------|----------------------------------------------------|
64+
| `localIP` | The address of the local DNS server. This entry is only used on Linux systems that are not configured to use systemd-resolved. | IP address [string][yaml-str] | first `nameserver` mentioned in `/etc/resolv.conf` |
65+
| `excludeSuffixes` | Suffixes for which the DNS resolver will always fail (or fallback in case of the overriding resolver). | [sequence][yaml-seq] of [strings][yaml-str] | `[".arpa", ".com", ".io", ".net", ".org", ".ru"]` |
66+
| `includeSuffixes` | Suffixes for which the DNS resolver will always attempt to do a lookup. Includes have higher priority than excludes. | [sequence][yaml-seq] of [strings][yaml-str] | `[]` |
67+
| `excludes` | Names to be excluded by the DNS resolver. | `[]` |
68+
| `mappings` | Names to be resolved to other names (CNAME records) or to explicit IP addresses | `[]` |
69+
| `lookupTimeout` | Maximum time to wait for a cluster side host lookup. | [duration][go-duration] [string][yaml-str] | 4 seconds |
7070

7171
Here is an example values.yaml:
7272
```yaml

0 commit comments

Comments
 (0)