From 2528faa422d04f834534a9a59f02fd3adc2da151 Mon Sep 17 00:00:00 2001 From: xiangpengzhao Date: Thu, 12 Oct 2017 13:47:43 +0800 Subject: [PATCH] Split downward API e2e test case for pod/host IP into two --- test/e2e/common/downward_api.go | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/test/e2e/common/downward_api.go b/test/e2e/common/downward_api.go index 74ada1aa6bd..5ccc80ba8f1 100644 --- a/test/e2e/common/downward_api.go +++ b/test/e2e/common/downward_api.go @@ -65,8 +65,7 @@ var _ = framework.KubeDescribe("Downward API", func() { testDownwardAPI(f, podName, env, expectations) }) - It("should provide pod and host IP as an env var [Conformance]", func() { - framework.SkipUnlessServerVersionGTE(hostIPVersion, f.ClientSet.Discovery()) + It("should provide pod IP as an env var [Conformance]", func() { podName := "downward-api-" + string(uuid.NewUUID()) env := []v1.EnvVar{ { @@ -78,6 +77,19 @@ var _ = framework.KubeDescribe("Downward API", func() { }, }, }, + } + + expectations := []string{ + "POD_IP=(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)", + } + + testDownwardAPI(f, podName, env, expectations) + }) + + It("should provide host IP as an env var [Conformance]", func() { + framework.SkipUnlessServerVersionGTE(hostIPVersion, f.ClientSet.Discovery()) + podName := "downward-api-" + string(uuid.NewUUID()) + env := []v1.EnvVar{ { Name: "HOST_IP", ValueFrom: &v1.EnvVarSource{ @@ -90,7 +102,6 @@ var _ = framework.KubeDescribe("Downward API", func() { } expectations := []string{ - "POD_IP=(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)", "HOST_IP=(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)\\.(?:\\d+)", }