Merge pull request #24128 from smarterclayton/dns_test_change

Allow cluster DNS e2e verification to be overriden
This commit is contained in:
Filip Grzadkowski
2016-05-20 10:26:13 +02:00

View File

@@ -260,8 +260,6 @@ var _ = framework.KubeDescribe("DNS", func() {
f := framework.NewDefaultFramework("dns") f := framework.NewDefaultFramework("dns")
It("should provide DNS for the cluster [Conformance]", func() { It("should provide DNS for the cluster [Conformance]", func() {
verifyDNSPodIsRunning(f)
// All the names we need to be able to resolve. // All the names we need to be able to resolve.
// TODO: Spin up a separate test service and test that dns works for that service. // TODO: Spin up a separate test service and test that dns works for that service.
namesToResolve := []string{ namesToResolve := []string{
@@ -288,8 +286,6 @@ var _ = framework.KubeDescribe("DNS", func() {
}) })
It("should provide DNS for services [Conformance]", func() { It("should provide DNS for services [Conformance]", func() {
verifyDNSPodIsRunning(f)
// Create a test headless service. // Create a test headless service.
By("Creating a test headless service") By("Creating a test headless service")
testServiceSelector := map[string]string{ testServiceSelector := map[string]string{
@@ -338,8 +334,6 @@ var _ = framework.KubeDescribe("DNS", func() {
}) })
It("should provide DNS for pods for Hostname and Subdomain Annotation", func() { It("should provide DNS for pods for Hostname and Subdomain Annotation", func() {
verifyDNSPodIsRunning(f)
// Create a test headless service. // Create a test headless service.
By("Creating a test headless service") By("Creating a test headless service")
testServiceSelector := map[string]string{ testServiceSelector := map[string]string{