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 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`.
@MrHohn

This comment has been minimized.

Copy link
Member Author

MrHohn commented Feb 12, 2018

/test pull-kubernetes-bazel-test

@BenTheElder

This comment has been minimized.

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

This comment has been minimized.

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

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

This comment has been minimized.

@bowei

bowei Feb 19, 2018

Member

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

This comment has been minimized.

@MrHohn

MrHohn Feb 19, 2018

Author Member

Indeed, will look into removing that dependency.

@bowei

This comment has been minimized.

Copy link
Member

bowei commented Feb 21, 2018

/status approved-for-milestone

@MrHohn MrHohn force-pushed the MrHohn:custom-pod-dns-e2e branch from 6ca5b39 to a042ee3 Feb 23, 2018

@MrHohn

This comment has been minimized.

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

This comment has been minimized.

Copy link
Member

thockin commented Feb 23, 2018

/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() {

This comment has been minimized.

@MrHohn

MrHohn Feb 23, 2018

Author Member

Most of the other parts are moving codes. Real change is in here.

@MrHohn

This comment has been minimized.

Copy link
Member Author

MrHohn commented Feb 23, 2018

/retest

@bowei

This comment has been minimized.

Copy link
Member

bowei commented Feb 23, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Feb 23, 2018

@k8s-ci-robot

This comment has been minimized.

Copy link
Contributor

k8s-ci-robot commented Feb 23, 2018

[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

This comment has been minimized.

Copy link
Contributor

k8s-github-robot commented Feb 25, 2018

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

13 checks passed

Submit Queue Queued to run github e2e tests a second time.
Details
cla/linuxfoundation MrHohn authorized
Details
pull-kubernetes-bazel-build Job succeeded.
Details
pull-kubernetes-bazel-test Job succeeded.
Details
pull-kubernetes-cross Skipped
pull-kubernetes-e2e-gce Job succeeded.
Details
pull-kubernetes-e2e-gce-device-plugin-gpu Job succeeded.
Details
pull-kubernetes-e2e-gke Skipped
pull-kubernetes-e2e-kops-aws Job succeeded.
Details
pull-kubernetes-kubemark-e2e-gce Job succeeded.
Details
pull-kubernetes-node-e2e Job succeeded.
Details
pull-kubernetes-unit Job succeeded.
Details
pull-kubernetes-verify Job succeeded.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.