From 76e90061a2b00f4918cbd91f71abbc37d8bd270f Mon Sep 17 00:00:00 2001 From: jianglingxia Date: Wed, 31 Jan 2018 15:06:32 +0800 Subject: [PATCH] reopen #58913 Fix TODO move GetPauseImageNameForHostArch func --- test/e2e/framework/util.go | 6 ------ test/e2e_node/critical_pod_test.go | 3 ++- test/e2e_node/density_test.go | 7 ++++--- test/e2e_node/eviction_test.go | 3 ++- test/e2e_node/image_list.go | 2 +- test/e2e_node/lifecycle_hook_test.go | 4 ++-- test/e2e_node/mirror_pod_test.go | 2 +- test/e2e_node/resource_usage_test.go | 3 ++- test/e2e_node/restart_test.go | 3 ++- test/e2e_node/simple_mount.go | 3 ++- test/utils/image/manifest.go | 5 +++++ 11 files changed, 23 insertions(+), 18 deletions(-) diff --git a/test/e2e/framework/util.go b/test/e2e/framework/util.go index 646f2c6f68..3ebaeae37a 100644 --- a/test/e2e/framework/util.go +++ b/test/e2e/framework/util.go @@ -229,12 +229,6 @@ func GetPauseImageName(c clientset.Interface) string { return imageutils.GetE2EImageWithArch(imageutils.Pause, GetServerArchitecture(c)) } -// GetPauseImageNameForHostArch fetches the pause image name for the same architecture the test is running on. -// TODO: move this function to the test/utils -func GetPauseImageNameForHostArch() string { - return imageutils.GetE2EImage(imageutils.Pause) -} - func GetServicesProxyRequest(c clientset.Interface, request *restclient.Request) (*restclient.Request, error) { return request.Resource("services").SubResource("proxy"), nil } diff --git a/test/e2e_node/critical_pod_test.go b/test/e2e_node/critical_pod_test.go index ea89136c18..e4e4e580d4 100644 --- a/test/e2e_node/critical_pod_test.go +++ b/test/e2e_node/critical_pod_test.go @@ -27,6 +27,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/apis/kubeletconfig" kubelettypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -130,7 +131,7 @@ func getTestPod(critical bool, name string, resources v1.ResourceRequirements) * Containers: []v1.Container{ { Name: "container", - Image: framework.GetPauseImageNameForHostArch(), + Image: imageutils.GetPauseImageNameForHostArch(), Resources: resources, }, }, diff --git a/test/e2e_node/density_test.go b/test/e2e_node/density_test.go index 7a99a49a86..e26a4d5991 100644 --- a/test/e2e_node/density_test.go +++ b/test/e2e_node/density_test.go @@ -36,6 +36,7 @@ import ( kubemetrics "k8s.io/kubernetes/pkg/kubelet/metrics" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/metrics" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -331,7 +332,7 @@ func runDensityBatchTest(f *framework.Framework, rc *ResourceCollector, testArg ) // create test pod data structure - pods := newTestPods(testArg.podsNr, true, framework.GetPauseImageNameForHostArch(), podType) + pods := newTestPods(testArg.podsNr, true, imageutils.GetPauseImageNameForHostArch(), podType) // the controller watches the change of pod status controller := newInformerWatchPod(f, mutex, watchTimes, podType) @@ -412,8 +413,8 @@ func runDensitySeqTest(f *framework.Framework, rc *ResourceCollector, testArg de podType = "density_test_pod" sleepBeforeCreatePods = 30 * time.Second ) - bgPods := newTestPods(testArg.bgPodsNr, true, framework.GetPauseImageNameForHostArch(), "background_pod") - testPods := newTestPods(testArg.podsNr, true, framework.GetPauseImageNameForHostArch(), podType) + bgPods := newTestPods(testArg.bgPodsNr, true, imageutils.GetPauseImageNameForHostArch(), "background_pod") + testPods := newTestPods(testArg.podsNr, true, imageutils.GetPauseImageNameForHostArch(), podType) By("Creating a batch of background pods") diff --git a/test/e2e_node/eviction_test.go b/test/e2e_node/eviction_test.go index f9272e192a..1f24b27d9a 100644 --- a/test/e2e_node/eviction_test.go +++ b/test/e2e_node/eviction_test.go @@ -32,6 +32,7 @@ import ( kubeletmetrics "k8s.io/kubernetes/pkg/kubelet/metrics" kubetypes "k8s.io/kubernetes/pkg/kubelet/types" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -429,7 +430,7 @@ func runEvictionTest(f *framework.Framework, pressureTimeout time.Duration, expe RestartPolicy: v1.RestartPolicyNever, Containers: []v1.Container{ { - Image: framework.GetPauseImageNameForHostArch(), + Image: imageutils.GetPauseImageNameForHostArch(), Name: podName, }, }, diff --git a/test/e2e_node/image_list.go b/test/e2e_node/image_list.go index 0c37c88752..b857700c14 100644 --- a/test/e2e_node/image_list.go +++ b/test/e2e_node/image_list.go @@ -51,7 +51,7 @@ var NodeImageWhiteList = sets.NewString( imageutils.GetE2EImage(imageutils.ServeHostname), imageutils.GetE2EImage(imageutils.Netexec), imageutils.GetE2EImage(imageutils.Nonewprivs), - framework.GetPauseImageNameForHostArch(), + imageutils.GetPauseImageNameForHostArch(), framework.GetGPUDevicePluginImage(), ) diff --git a/test/e2e_node/lifecycle_hook_test.go b/test/e2e_node/lifecycle_hook_test.go index 9eae7891ef..f9e765846e 100644 --- a/test/e2e_node/lifecycle_hook_test.go +++ b/test/e2e_node/lifecycle_hook_test.go @@ -116,7 +116,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { }, }, } - podWithHook := getPodWithHook("pod-with-poststart-http-hook", framework.GetPauseImageNameForHostArch(), lifecycle) + podWithHook := getPodWithHook("pod-with-poststart-http-hook", imageutils.GetPauseImageNameForHostArch(), lifecycle) testPodWithHook(podWithHook) }) framework.ConformanceIt("should execute prestop http hook properly", func() { @@ -129,7 +129,7 @@ var _ = framework.KubeDescribe("Container Lifecycle Hook", func() { }, }, } - podWithHook := getPodWithHook("pod-with-prestop-http-hook", framework.GetPauseImageNameForHostArch(), lifecycle) + podWithHook := getPodWithHook("pod-with-prestop-http-hook", imageutils.GetPauseImageNameForHostArch(), lifecycle) testPodWithHook(podWithHook) }) }) diff --git a/test/e2e_node/mirror_pod_test.go b/test/e2e_node/mirror_pod_test.go index 6794cfcf59..74a438acda 100644 --- a/test/e2e_node/mirror_pod_test.go +++ b/test/e2e_node/mirror_pod_test.go @@ -64,7 +64,7 @@ var _ = framework.KubeDescribe("MirrorPod", func() { uid := pod.UID By("update the static pod container image") - image := framework.GetPauseImageNameForHostArch() + image := imageutils.GetPauseImageNameForHostArch() err = createStaticPod(manifestPath, staticPodName, ns, image, v1.RestartPolicyAlways) Expect(err).ShouldNot(HaveOccurred()) diff --git a/test/e2e_node/resource_usage_test.go b/test/e2e_node/resource_usage_test.go index 49003d71d3..6de87b7f41 100644 --- a/test/e2e_node/resource_usage_test.go +++ b/test/e2e_node/resource_usage_test.go @@ -26,6 +26,7 @@ import ( clientset "k8s.io/client-go/kubernetes" stats "k8s.io/kubernetes/pkg/kubelet/apis/stats/v1alpha1" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -142,7 +143,7 @@ func runResourceUsageTest(f *framework.Framework, rc *ResourceCollector, testArg // sleep for an interval here to measure steady data sleepAfterCreatePods = 10 * time.Second ) - pods := newTestPods(testArg.podsNr, true, framework.GetPauseImageNameForHostArch(), "test_pod") + pods := newTestPods(testArg.podsNr, true, imageutils.GetPauseImageNameForHostArch(), "test_pod") rc.Start() // Explicitly delete pods to prevent namespace controller cleanning up timeout diff --git a/test/e2e_node/restart_test.go b/test/e2e_node/restart_test.go index ac37cf606f..b8d8f1605f 100644 --- a/test/e2e_node/restart_test.go +++ b/test/e2e_node/restart_test.go @@ -31,6 +31,7 @@ import ( . "github.com/onsi/gomega" "k8s.io/api/core/v1" testutils "k8s.io/kubernetes/test/utils" + imageutils "k8s.io/kubernetes/test/utils/image" ) // waitForPods waits for timeout duration, for pod_count. @@ -80,7 +81,7 @@ var _ = framework.KubeDescribe("Restart [Serial] [Slow] [Disruptive]", func() { Context("Network", func() { It("should recover from ip leak", func() { - pods := newTestPods(podCount, false, framework.GetPauseImageNameForHostArch(), "restart-container-runtime-test") + pods := newTestPods(podCount, false, imageutils.GetPauseImageNameForHostArch(), "restart-container-runtime-test") By(fmt.Sprintf("Trying to create %d pods on node", len(pods))) createBatchPodWithRateControl(f, pods, podCreationInterval) defer deletePodsSync(f, pods) diff --git a/test/e2e_node/simple_mount.go b/test/e2e_node/simple_mount.go index d29c00e2a9..493c3d3997 100644 --- a/test/e2e_node/simple_mount.go +++ b/test/e2e_node/simple_mount.go @@ -20,6 +20,7 @@ import ( "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" ) @@ -42,7 +43,7 @@ var _ = framework.KubeDescribe("SimpleMount", func() { Containers: []v1.Container{ { Name: "simple-mount-container", - Image: framework.GetPauseImageNameForHostArch(), + Image: imageutils.GetPauseImageNameForHostArch(), VolumeMounts: []v1.VolumeMount{ { Name: "simply-mounted-volume", diff --git a/test/utils/image/manifest.go b/test/utils/image/manifest.go index 3e9ebdadd9..b6c64bfb7a 100644 --- a/test/utils/image/manifest.go +++ b/test/utils/image/manifest.go @@ -112,3 +112,8 @@ func GetE2EImageWithArch(image ImageConfig, arch string) string { } } + +// GetPauseImageNameForHostArch fetches the pause image name for the same architecture the test is running on. +func GetPauseImageNameForHostArch() string { + return GetE2EImage(Pause) +}