Merge pull request #64184 from dixudx/e2e_cadvisor_skew

Automatic merge from submit-queue. Prevent 1.10 e2es testing deprecated CAdvisorPort in 1.11 **What this PR does / why we need it**: The public cadvisor port by default is disabled in #63881, targeted for v1.11. But 1.10 e2e tests get run against v1.11+ masters during upgrade tests. https://k8s-testgrid.appspot.com/sig-release-master-upgrade#gce-1.10-master-upgrade-cluster-parallel **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #64158 **Special notes for your reviewer**: /cc luxas BenTheElder krzyzacy **Release note**: ```release-note Prevent 1.10 e2es testing deprecated CAdvisorPort in v1.11 ```

Merge pull request #64184 from dixudx/e2e_cadvisor_skew
e9491e9d · Kubernetes Submit Queue · GitHub · bf66c23f · 5780750c · e9491e9d
Unverified Commit e9491e9d authored May 24, 2018 by Kubernetes Submit Queue Committed by GitHub May 24, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 1 deletion

BUILD test/e2e/network/BUILD +1 -0

proxy.go test/e2e/network/proxy.go +14 -1

No files found.
--- a/test/e2e/network/BUILD
+++ b/test/e2e/network/BUILD
@@ -40,6 +40,7 @@ go_library(
        "//pkg/controller/endpoint:go_default_library",
        "//pkg/kubelet/apis:go_default_library",
        "//pkg/master/ports:go_default_library",
+        "//pkg/util/version:go_default_library",
        "//test/e2e/framework:go_default_library",
        "//test/e2e/manifest:go_default_library",
        "//test/e2e/network/scale:go_default_library",

--- a/test/e2e/network/proxy.go
+++ b/test/e2e/network/proxy.go
@@ -33,6 +33,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/net"
 	clientset "k8s.io/client-go/kubernetes"
 	"k8s.io/kubernetes/pkg/api/testapi"
+	utilversion "k8s.io/kubernetes/pkg/util/version"
 	"k8s.io/kubernetes/test/e2e/framework"
 	testutils "k8s.io/kubernetes/test/utils"
 	imageutils "k8s.io/kubernetes/test/utils/image"
@@ -52,8 +53,11 @@ const (
 	proxyHTTPCallTimeout = 30 * time.Second
 )

+var deprecatedCAdvisorPortRemovedVersion = utilversion.MustParseSemantic("v1.11.0-alpha.0")
+
 var _ = SIGDescribe("Proxy", func() {
 	version := testapi.Groups[v1.GroupName].GroupVersion().Version
+
 	Context("version "+version, func() {
 		options := framework.FrameworkOptions{
 			ClientQPS: -1.0,
@@ -61,6 +65,13 @@ var _ = SIGDescribe("Proxy", func() {
 		f := framework.NewFramework("proxy", options, nil)
 		prefix := "/api/" + version

+		skipCAdvisorProxyTests := false
+		BeforeEach(func() {
+			var err error
+			skipCAdvisorProxyTests, err = framework.ServerVersionGTE(deprecatedCAdvisorPortRemovedVersion, f.ClientSet.Discovery())
+			Expect(err).NotTo(HaveOccurred())
+		})
+
 		/*
 			    Testname: proxy-subresource-node-logs-port
 			    Description: Ensure that proxy on node logs works with node proxy
@@ -74,7 +85,9 @@ var _ = SIGDescribe("Proxy", func() {
 				subresource.
 		*/
 		framework.ConformanceIt("should proxy logs on node using proxy subresource ", func() { nodeProxyTest(f, prefix+"/nodes/", "/proxy/logs/") })
-		It("should proxy to cadvisor using proxy subresource", func() { nodeProxyTest(f, prefix+"/nodes/", ":4194/proxy/containers/") })
+		if !skipCAdvisorProxyTests {
+			It("should proxy to cadvisor using proxy subresource", func() { nodeProxyTest(f, prefix+"/nodes/", ":4194/proxy/containers/") })
+		}

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