Merge pull request #64524 from krzyzacy/release-1.10

Automatic merge from submit-queue. properly skip cadvisor proxy test xref https://github.com/kubernetes/kubernetes/issues/64158 per https://github.com/kubernetes/kubernetes/issues/64158#issuecomment-393229314 /assign @liggitt @AishSundar

Merge pull request #64524 from krzyzacy/release-1.10
547d38b1 · Kubernetes Submit Queue · GitHub · 44353094 · 541dfd63 · 547d38b1
Unverified Commit 547d38b1 authored May 31, 2018 by Kubernetes Submit Queue Committed by GitHub May 31, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

proxy.go test/e2e/network/proxy.go +7 -3

No files found.
--- a/test/e2e/network/proxy.go
+++ b/test/e2e/network/proxy.go
@@ -85,9 +85,13 @@ var _ = SIGDescribe("Proxy", func() {
 				subresource.
 		*/
 		framework.ConformanceIt("should proxy logs on node using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", "/proxy/logs/") })
-		if !skipCAdvisorProxyTests {
-			It("should proxy to cadvisor using proxy subresource", func() { nodeProxyTest(f, prefix+"/nodes/", ":4194/proxy/containers/") })
-		}
+
+		It("should proxy to cadvisor using proxy subresource", func() {
+			if skipCAdvisorProxyTests {
+				framework.Skipf("cadvisor proxy test removed on newer server version")
+			}
+			nodeProxyTest(f, prefix+"/nodes/", ":4194/proxy/containers/")
+		})

 		// using the porter image to serve content, access the content
 		// (of multiple pods?) from multiple (endpoints/services?)