From fc2af0e5a42eda0899700714ce8ff554a49652ba Mon Sep 17 00:00:00 2001
From: Mayank Gaikwad <8110509+mgdevstack@users.noreply.github.com>
Date: Tue, 14 May 2019 23:53:00 +0530
Subject: [PATCH] Promote e2e verifying DNS resolution for o pod's fqdn,
 hostname and subdomain

---
 test/conformance/testdata/conformance.txt |  2 ++
 test/e2e/network/dns.go                   | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/conformance/testdata/conformance.txt b/test/conformance/testdata/conformance.txt
index 278c8ff71fb..0c81cb95f9f 100644
--- a/test/conformance/testdata/conformance.txt
+++ b/test/conformance/testdata/conformance.txt
@@ -191,6 +191,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 c3997f88a27..616e6a174c7 100644
--- a/test/e2e/network/dns.go
+++ b/test/e2e/network/dns.go
@@ -220,7 +220,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{
@@ -255,7 +261,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{