diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt index d9f57067879..526498446cd 100644 --- a/test/conformance/testdata/conformance.txt +++ b/test/conformance/testdata/conformance.txt @@ -195,6 +195,8 @@ test/e2e/kubectl/kubectl.go: "should support --unix-socket=/path" test/e2e/network/dns.go: "should provide DNS for the cluster" test/e2e/network/dns.go: "should provide /etc/hosts entries for the cluster" test/e2e/network/dns.go: "should provide DNS for services" +test/e2e/network/dns.go: "should provide DNS for pods for Hostname" +test/e2e/network/dns.go: "should provide DNS for pods for Subdomain" test/e2e/network/dns.go: "should provide DNS for ExternalName services" test/e2e/network/proxy.go: "should proxy logs on node with explicit kubelet port using proxy subresource" test/e2e/network/proxy.go: "should proxy logs on node using proxy subresource" diff --git a/test/e2e/network/dns.go b/test/e2e/network/dns.go index 77b6e432300..f85f52d2bdc 100644 --- a/test/e2e/network/dns.go +++ b/test/e2e/network/dns.go @@ -221,7 +221,13 @@ var _ = SIGDescribe("DNS", func() { validateDNSResults(f, pod, append(wheezyFileNames, jessieFileNames...)) }) - ginkgo.It("should provide DNS for pods for Hostname [LinuxOnly]", func() { + /* + Release: v1.15 + Testname: DNS, resolve the hostname + Description: Create a headless service with label. Create a Pod with label to match service's label, with hostname and a subdomain same as service name. + Pod MUST be able to resolve its fully qualified domain name as well as hostname by serving an A record at that name. + */ + framework.ConformanceIt("should provide DNS for pods for Hostname [LinuxOnly]", func() { // Create a test headless service. ginkgo.By("Creating a test headless service") testServiceSelector := map[string]string{ @@ -256,7 +262,13 @@ var _ = SIGDescribe("DNS", func() { validateDNSResults(f, pod1, append(wheezyFileNames, jessieFileNames...)) }) - ginkgo.It("should provide DNS for pods for Subdomain", func() { + /* + Release: v1.15 + Testname: DNS, resolve the subdomain + Description: Create a headless service with label. Create a Pod with label to match service's label, with hostname and a subdomain same as service name. + Pod MUST be able to resolve its fully qualified domain name as well as subdomain by serving an A record at that name. + */ + framework.ConformanceIt("should provide DNS for pods for Subdomain", func() { // Create a test headless service. ginkgo.By("Creating a test headless service") testServiceSelector := map[string]string{