Skip to content
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

Merged
merged 4 commits into from Feb 25, 2018

Conversation

MrHohn
Copy link
Member

@MrHohn MrHohn commented Feb 12, 2018

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:

Adds BETA support for `DNSConfig` field in PodSpec and `DNSPolicy=None`.

@k8s-ci-robot k8s-ci-robot added the release-note Denotes a PR that will be considered when it comes time to generate release notes. label Feb 12, 2018
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 12, 2018
@MrHohn
Copy link
Member Author

MrHohn commented Feb 12, 2018

/test pull-kubernetes-bazel-test

@BenTheElder
Copy link
Member

BenTheElder commented Feb 13, 2018

[remote caching experiment, please ignore]
/test pull-kubernetes-bazel-test-canary
/test pull-kubernetes-bazel-build-canary

1 similar comment
@BenTheElder
Copy link
Member

[remote caching experiment, please ignore]
/test pull-kubernetes-bazel-test-canary
/test pull-kubernetes-bazel-build-canary

@@ -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)
Copy link
Member

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...).

Copy link
Member Author

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.

@bowei
Copy link
Member

bowei commented Feb 21, 2018

/status approved-for-milestone

@MrHohn
Copy link
Member Author

MrHohn commented Feb 23, 2018

@bowei Rewrote the e2e test and moved most of previous resolv.conf checkings into unit test, PTAL thanks!

@thockin
Copy link
Member

thockin commented Feb 23, 2018

/approve

leaving the LGTM to Bowei.

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 23, 2018

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() {
Copy link
Member Author

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.

@MrHohn
Copy link
Member Author

MrHohn commented Feb 23, 2018

/retest

@bowei
Copy link
Member

bowei commented Feb 23, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 23, 2018
@k8s-ci-robot
Copy link
Contributor

[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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-github-robot
Copy link

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.

@k8s-github-robot k8s-github-robot merged commit ac25308 into kubernetes:master Feb 25, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Need e2e test for configurable pod resolv.conf (a.k.a CustomPodDNS)
6 participants