From db7cb5f7fd85ed4ef0c916fc89a41b480d1c8c09 Mon Sep 17 00:00:00 2001 From: "Timothy St. Clair" Date: Tue, 10 Oct 2017 15:17:36 -0500 Subject: [PATCH] Fix to prevent downward api change break on older versions Signed-off-by: Timothy St. Clair --- test/e2e/common/BUILD | 1 + test/e2e/common/downward_api.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/test/e2e/common/BUILD b/test/e2e/common/BUILD index d599a2c6dcb..d86b81a6795 100644 --- a/test/e2e/common/BUILD +++ b/test/e2e/common/BUILD @@ -41,6 +41,7 @@ go_library( "//pkg/kubelet:go_default_library", "//pkg/kubelet/sysctl:go_default_library", "//pkg/security/apparmor:go_default_library", + "//pkg/util/version:go_default_library", "//test/e2e/framework:go_default_library", "//test/utils:go_default_library", "//test/utils/image:go_default_library", diff --git a/test/e2e/common/downward_api.go b/test/e2e/common/downward_api.go index cab32eaf286..74ada1aa6bd 100644 --- a/test/e2e/common/downward_api.go +++ b/test/e2e/common/downward_api.go @@ -23,11 +23,14 @@ import ( "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" + utilversion "k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" . "github.com/onsi/ginkgo" ) +var hostIPVersion = utilversion.MustParseSemantic("v1.8.0") + var _ = framework.KubeDescribe("Downward API", func() { f := framework.NewDefaultFramework("downward-api") @@ -63,6 +66,7 @@ var _ = framework.KubeDescribe("Downward API", func() { }) It("should provide pod and host IP as an env var [Conformance]", func() { + framework.SkipUnlessServerVersionGTE(hostIPVersion, f.ClientSet.Discovery()) podName := "downward-api-" + string(uuid.NewUUID()) env := []v1.EnvVar{ {