Merge pull request #52840 from xiangpengzhao/fix-dns

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.. Don't specify clusterIP in dns e2e test **What this PR does / why we need it**: Different upgrade tests may configure different service clusterIP ranges. If we specify the clusterIP in dns e2e test, it will succeed in one upgrade test but fail in another. This PR doesn't specify clusterIP. It just uses the allocated clusterIP. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #50274 **Special notes for your reviewer**: Hope this can really fixes that issue. /cc @thockin @MrHohn **Release note**: ```release-note NONE ```

Merge pull request #52840 from xiangpengzhao/fix-dns
e47b8a67 · Kubernetes Submit Queue · GitHub · 54248618 · a8e7dd88 · e47b8a67
Commit e47b8a67 authored Sep 21, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 21, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

dns.go test/e2e/network/dns.go +4 -2

No files found.
--- a/test/e2e/network/dns.go
+++ b/test/e2e/network/dns.go
@@ -449,7 +449,6 @@ var _ = SIGDescribe("DNS", func() {
 		By("changing the service to type=ClusterIP")
 		_, err = framework.UpdateService(f.ClientSet, f.Namespace.Name, serviceName, func(s *v1.Service) {
 			s.Spec.Type = v1.ServiceTypeClusterIP
-			s.Spec.ClusterIP = "10.0.0.123"
 			s.Spec.Ports = []v1.ServicePort{
 				{Port: 80, Name: "http", Protocol: "TCP"},
 			}
@@ -464,6 +463,9 @@ var _ = SIGDescribe("DNS", func() {
 		By("creating a third pod to probe DNS")
 		pod3 := createDNSPod(f.Namespace.Name, wheezyProbeCmd, jessieProbeCmd, true)

-		validateTargetedProbeOutput(f, pod3, []string{wheezyFileName, jessieFileName}, "10.0.0.123")
+		svc, err := f.ClientSet.Core().Services(f.Namespace.Name).Get(externalNameService.Name, metav1.GetOptions{})
+		Expect(err).NotTo(HaveOccurred())
+
+		validateTargetedProbeOutput(f, pod3, []string{wheezyFileName, jessieFileName}, svc.Spec.ClusterIP)
 	})
 })