Skip to content

Commit

Permalink
Doc change for configurable pod resolv.conf Beta (#7611)
Browse files Browse the repository at this point in the history
  • Loading branch information
MrHohn authored and k8s-ci-robot committed Mar 3, 2018
1 parent dcb8f8b commit 7d71e66
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion docs/concepts/services-networking/custom-dns.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
kind: Pod
metadata:
namespace: ns1
namespace: default
name: dns-example
spec:
containers:
Expand Down
10 changes: 5 additions & 5 deletions docs/concepts/services-networking/dns-pod-service.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ following pod-specific DNS policies. These policies are specified in the
for details on how DNS queries are handled in those cases.
- "`ClusterFirstWithHostNet`": For Pods running with hostNetwork, you should
explicitly set its DNS policy "`ClusterFirstWithHostNet`".
- "`None`": A new option value introduced in Kubernetes v1.9. This Alpha feature
- "`None`": A new option value introduced in Kubernetes v1.9 (Beta in v1.10). It
allows a Pod to ignore DNS settings from the Kubernetes environment. All DNS
settings are supposed to be provided using the `dnsConfig` field in the Pod Spec.
See [DNS config](#dns-config) subsection below.
Expand Down Expand Up @@ -198,8 +198,9 @@ spec:

### Pod's DNS Config

Kubernetes v1.9 introduces an Alpha feature that allows users more control on
the DNS settings for a Pod. To enable this feature, the cluster administrator
Kubernetes v1.9 introduces an Alpha feature (Beta in v1.10) that allows users more
control on the DNS settings for a Pod. This feature is enabled by default in v1.10.
To enable this feature in v1.9, the cluster administrator
needs to enable the `CustomPodDNS` feature gate on the apiserver and the kubelet,
for example, "`--feature-gates=CustomPodDNS=true,...`".
When the feature gate is enabled, users can set the `dnsPolicy` field of a Pod
Expand Down Expand Up @@ -237,8 +238,7 @@ in its `/etc/resolv.conf` file:
```
nameserver 1.2.3.4
search ns1.svc.cluster.local my.dns.search.suffix
options ndots:2
options edns0
options ndots:2 edns0
```

{% endcapture %}
Expand Down

0 comments on commit 7d71e66

Please sign in to comment.