whentimeslows/website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doc change for configurable pod resolv.conf Beta (#7611)

Browse Source
This commit is contained in:
Zihong Zheng
2018-03-03 11:17:53 -08:00
committed by k8s-ci-robot
parent dcb8f8b8b4
commit 7d71e6614c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/concepts/services-networking/custom-dns.yaml
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1 apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
namespace: ns1 namespace: default
name: dns-example name: dns-example
spec: spec:
containers: containers:
docs/concepts/services-networking/dns-pod-service.md
+5 -5
View File
@@ -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. for details on how DNS queries are handled in those cases.
- "`ClusterFirstWithHostNet`": For Pods running with hostNetwork, you should - "`ClusterFirstWithHostNet`": For Pods running with hostNetwork, you should
explicitly set its DNS policy "`ClusterFirstWithHostNet`". 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 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. settings are supposed to be provided using the `dnsConfig` field in the Pod Spec.
See [DNS config](#dns-config) subsection below. See [DNS config](#dns-config) subsection below.
@@ -198,8 +198,9 @@ spec:
### Pod's DNS Config ### Pod's DNS Config
Kubernetes v1.9 introduces an Alpha feature that allows users more control on Kubernetes v1.9 introduces an Alpha feature (Beta in v1.10) that allows users more
the DNS settings for a Pod. To enable this feature, the cluster administrator 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, needs to enable the `CustomPodDNS` feature gate on the apiserver and the kubelet,
for example, "`--feature-gates=CustomPodDNS=true,...`". for example, "`--feature-gates=CustomPodDNS=true,...`".
When the feature gate is enabled, users can set the `dnsPolicy` field of a Pod When the feature gate is enabled, users can set the `dnsPolicy` field of a Pod
@@ -237,8 +238,7 @@ in its `/etc/resolv.conf` file:
``` ```
nameserver 1.2.3.4 nameserver 1.2.3.4
search ns1.svc.cluster.local my.dns.search.suffix search ns1.svc.cluster.local my.dns.search.suffix
options ndots:2 options ndots:2 edns0
options edns0
``` ```
{% endcapture %} {% endcapture %}