-
Notifications
You must be signed in to change notification settings - Fork 40k
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
Promote configurable pod resolv.conf to Beta and add an e2e test #59771
Promote configurable pod resolv.conf to Beta and add an e2e test #59771
Conversation
/test pull-kubernetes-bazel-test |
[remote caching experiment, please ignore] |
1 similar comment
[remote caching experiment, please ignore] |
pkg/kubelet/network/dns/dns_test.go
Outdated
@@ -247,10 +247,10 @@ func TestMergeDNSOptions(t *testing.T) { | |||
} | |||
|
|||
for _, tc := range testCases { | |||
options := mergeDNSOptions(tc.existingDNSConfigOptions, tc.dnsConfigOptions) | |||
options := MergeDNSOptions(tc.existingDNSConfigOptions, tc.dnsConfigOptions) |
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.
Can we do the test without referencing the functions that are used to implement the feature? This seems a bit circular dep (suppose MergeDNSOptions has a bug...).
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.
Indeed, will look into removing that dependency.
/status approved-for-milestone |
6ca5b39
to
a042ee3
Compare
@bowei Rewrote the e2e test and moved most of previous resolv.conf checkings into unit test, PTAL thanks! |
/approve leaving the LGTM to Bowei. |
|
||
svc, err := f.ClientSet.CoreV1().Services(f.Namespace.Name).Get(externalNameService.Name, metav1.GetOptions{}) | ||
Expect(err).NotTo(HaveOccurred()) | ||
|
||
validateTargetedProbeOutput(f, pod3, []string{wheezyFileName, jessieFileName}, svc.Spec.ClusterIP) | ||
}) | ||
|
||
It("should support configurable pod resolv.conf", func() { |
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.
Most of the other parts are moving codes. Real change is in here.
/retest |
/lgtm |
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: bowei, MrHohn, thockin The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Automatic merge from submit-queue (batch tested with PRs 60324, 60269, 59771, 60314, 59941). If you want to cherry-pick this change to another branch, please follow the instructions here. |
What this PR does / why we need it:
Feature issue: kubernetes/enhancements#504
There is no semantic changes.
CustomPodDNS
feature gate will be turned on by default.Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)
format, will close the issue(s) when PR gets merged):Fixes #56521
Special notes for your reviewer:
/assign @bowei @thockin
Release note: