Merge pull request kubernetes#69004 from mgdevstack/master-pods-websocket-conformance

Promote pod's websocket based NodeConformance tests to Conformance

Author: k8s-ci-robot

test/conformance/testdata/conformance.txt

@@ -111,6 +111,8 @@ test/e2e/common/pods.go: "should be submitted and removed"
 test/e2e/common/pods.go: "should be updated"
 test/e2e/common/pods.go: "should allow activeDeadlineSeconds to be updated"
 test/e2e/common/pods.go: "should contain environment variables for services"
+test/e2e/common/pods.go: "should support remote command execution over websockets"
+test/e2e/common/pods.go: "should support retrieving logs from the container over websockets"
 test/e2e/common/projected.go: "should be consumable from pods in volume"
 test/e2e/common/projected.go: "should be consumable from pods in volume with defaultMode set"
 test/e2e/common/projected.go: "should be consumable from pods in volume as non-root with defaultMode and fsGroup set"

test/e2e/common/pods.go

@@ -472,7 +472,13 @@ var _ = framework.KubeDescribe("Pods", func() {
 		}, maxRetries, "Container should have service environment variables set")
 	})
 
-	It("should support remote command execution over websockets [NodeConformance]", func() {
+	/*
+		Release : v1.13
+		Testname: Pods, remote command execution over websocket
+		Description: A Pod is created. Websocket is created to retrieve exec command output from this pod.
+		Message retrieved form Websocket MUST match with expected exec command output.
+	*/
+	framework.ConformanceIt("should support remote command execution over websockets [NodeConformance]", func() {
 		config, err := framework.LoadConfig()
 		Expect(err).NotTo(HaveOccurred(), "unable to get base config")
 
@@ -548,7 +554,13 @@ var _ = framework.KubeDescribe("Pods", func() {
 		}, time.Minute, 10*time.Second).Should(BeNil())
 	})
 
-	It("should support retrieving logs from the container over websockets [NodeConformance]", func() {
+	/*
+		Release : v1.13
+		Testname: Pods, logs from websockets
+		Description: A Pod is created. Websocket is created to retrieve log of a container from this pod.
+		Message retrieved form Websocket MUST match with container's output.
+	*/
+	framework.ConformanceIt("should support retrieving logs from the container over websockets [NodeConformance]", func() {
 		config, err := framework.LoadConfig()
 		Expect(err).NotTo(HaveOccurred(), "unable to get base config")