From 3292bb6145d95be90f8d25c2de93c17495408722 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Wed, 29 Apr 2020 17:56:58 -0400 Subject: [PATCH] Drop conformance tag for tests that rely directly on kubelet /logs API In caf0d1d61874a2c8687b7deb773eca30ddaee5b6 we documented a policy to ensure that conformance tests should not rely in existence or use of kubelet apis directly. So based on that we should drop conformance for the two tests here that use the "/logs" endpoint directly. Signed-off-by: Davanum Srinivas --- test/conformance/testdata/conformance.yaml | 14 -------------- test/e2e/network/proxy.go | 14 ++++++-------- 2 files changed, 6 insertions(+), 22 deletions(-) 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?)