Skip Sysctl tests against v1.11.0-alpha.0 and newer

1.10 e2e tests get run against 1.11.0+ masters during upgrade tests. This fails as Sysctl moved from annotations to fields, so we should check the version and avoid running these tests.

Skip Sysctl tests against v1.11.0-alpha.0 and newer
252286e7 · Davanum Srinivas · c2a8c9ce · 252286e7
Unverified Commit 252286e7 authored Jun 06, 2018 by Davanum Srinivas
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 0 deletions

sysctl.go test/e2e/common/sysctl.go +11 -0

No files found.
--- a/test/e2e/common/sysctl.go
+++ b/test/e2e/common/sysctl.go
@@ -22,12 +22,15 @@ import (
 	"k8s.io/apimachinery/pkg/util/uuid"
 	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	"k8s.io/kubernetes/pkg/kubelet/sysctl"
+	utilversion "k8s.io/kubernetes/pkg/util/version"
 	"k8s.io/kubernetes/test/e2e/framework"

 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )

+var sysctlFeatureFromAnnotationsToAPIFields = utilversion.MustParseSemantic("v1.11.0-alpha.0")
+
 var _ = framework.KubeDescribe("Sysctls", func() {
 	f := framework.NewDefaultFramework("sysctl")
 	var podClient *framework.PodClient
@@ -54,6 +57,14 @@ var _ = framework.KubeDescribe("Sysctls", func() {
 	}

 	BeforeEach(func() {
+		var err error
+		skipSysctlTests, err := framework.ServerVersionGTE(sysctlFeatureFromAnnotationsToAPIFields, f.ClientSet.Discovery())
+		Expect(err).NotTo(HaveOccurred())
+
+		if skipSysctlTests {
+			framework.Skipf("Skipping all Sysctls tests. Running version > %q", sysctlFeatureFromAnnotationsToAPIFields)
+		}
+
 		podClient = f.PodClient()
 	})