Skip to content

K
k3s
Unverified Commit 2e433e81 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #64852 from dims/skip-tests-as-we-promoted-sysctl-annotations-to-fields-2

Automatic merge from submit-queue. Skip Sysctl tests against v1.11.0-alpha.0 and newer **What this PR does / why we need it**: 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. **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 #64845 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents ae94ada5 252286e7
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 0 deletions
test/e2e/common/sysctl.go
View file @ 2e433e81
...@@ -22,12 +22,15 @@ import ( ...@@ -22,12 +22,15 @@ import (
"k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/uuid"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/kubelet/sysctl" "k8s.io/kubernetes/pkg/kubelet/sysctl"
utilversion "k8s.io/kubernetes/pkg/util/version"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
var sysctlFeatureFromAnnotationsToAPIFields = utilversion.MustParseSemantic("v1.11.0-alpha.0")
var _ = framework.KubeDescribe("Sysctls", func() { var _ = framework.KubeDescribe("Sysctls", func() {
f := framework.NewDefaultFramework("sysctl") f := framework.NewDefaultFramework("sysctl")
var podClient *framework.PodClient var podClient *framework.PodClient
...@@ -54,6 +57,14 @@ var _ = framework.KubeDescribe("Sysctls", func() { ...@@ -54,6 +57,14 @@ var _ = framework.KubeDescribe("Sysctls", func() {
} }
BeforeEach(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() podClient = f.PodClient()
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment