diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 1e9c5139b1b..54390da8e36 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -1569,20 +1569,6 @@ other platforms like Windows. release: v1.9 file: test/e2e/common/networking.go -- testname: Proxy, logs endpoint - codename: '[sig-network] Proxy version v1 should proxy logs on node using proxy - subresource [Conformance]' - description: Select any node in the cluster to invoke /proxy/nodes///logs - endpoint. This endpoint MUST be reachable. - release: v1.9 - file: test/e2e/network/proxy.go -- testname: Proxy, logs port endpoint - codename: '[sig-network] Proxy version v1 should proxy logs on node with explicit - kubelet port using proxy subresource [Conformance]' - description: Select any node in the cluster to invoke /proxy/nodes/:10250/logs - endpoint. This endpoint MUST be reachable. - release: v1.9 - file: test/e2e/network/proxy.go - testname: Proxy, logs service endpoint codename: '[sig-network] Proxy version v1 should proxy through a service and a pod [Conformance]' description: Select any node in the cluster to invoke /logs endpoint using the diff --git a/test/e2e/network/proxy.go b/test/e2e/network/proxy.go index 77cc6241d11..8ace511db27 100644 --- a/test/e2e/network/proxy.go +++ b/test/e2e/network/proxy.go @@ -64,18 +64,16 @@ var _ = SIGDescribe("Proxy", func() { prefix := "/api/" + version /* - Release : v1.9 - Testname: Proxy, logs port endpoint - Description: Select any node in the cluster to invoke /proxy/nodes/:10250/logs endpoint. This endpoint MUST be reachable. + Test for Proxy, logs port endpoint + Select any node in the cluster to invoke /proxy/nodes/:10250/logs endpoint. This endpoint MUST be reachable. */ - framework.ConformanceIt("should proxy logs on node with explicit kubelet port using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", ":10250/proxy/logs/") }) + ginkgo.It("should proxy logs on node with explicit kubelet port using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", ":10250/proxy/logs/") }) /* - Release : v1.9 - Testname: Proxy, logs endpoint - Description: Select any node in the cluster to invoke /proxy/nodes///logs endpoint. This endpoint MUST be reachable. + Test for Proxy, logs endpoint + Select any node in the cluster to invoke /proxy/nodes///logs endpoint. This endpoint MUST be reachable. */ - framework.ConformanceIt("should proxy logs on node using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", "/proxy/logs/") }) + ginkgo.It("should proxy logs on node using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", "/proxy/logs/") }) // using the porter image to serve content, access the content // (of multiple pods?) from multiple (endpoints/services?)