-
Notifications
You must be signed in to change notification settings - Fork 14.4k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Doc change for configurable pod resolv.conf Beta #7611
Merged
k8s-ci-robot
merged 1 commit into
kubernetes:release-1.10
from
MrHohn:custom-pod-dns-beta
Mar 3, 2018
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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. | ||
|
@@ -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 | ||
|
@@ -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 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is reflecting the actual implementation. |
||
``` | ||
|
||
{% endcapture %} | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Figured it might be easier for user to try it out in the default namespace.