Merge pull request #64524 from krzyzacy/release-1.10

Automatic merge from submit-queue.

properly skip cadvisor proxy test

xref #64158

per #64158 (comment)

/assign @liggitt @AishSundar

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?)