From 2cd42c3600e5f00a6151943bb9a04a329a082caf Mon Sep 17 00:00:00 2001 From: thdrnsdk Date: Tue, 14 Aug 2018 22:37:40 +0900 Subject: [PATCH] delete the busyboxImage and mountTest var and change use imageutils --- test/e2e/common/apparmor.go | 2 +- test/e2e/common/configmap.go | 5 ++-- test/e2e/common/configmap_volume.go | 16 ++++++------- test/e2e/common/container_probe.go | 6 ++--- test/e2e/common/downward_api.go | 9 ++++---- test/e2e/common/downwardapi_volume.go | 11 +++++---- test/e2e/common/expansion.go | 13 ++++++----- test/e2e/common/host_path.go | 5 ++-- test/e2e/common/init_container.go | 20 ++++++++-------- test/e2e/common/pods.go | 10 ++++---- test/e2e/common/privileged.go | 5 ++-- test/e2e/common/projected.go | 33 ++++++++++++++------------- test/e2e/common/secrets.go | 5 ++-- test/e2e/common/secrets_volume.go | 13 ++++++----- test/e2e/common/sysctl.go | 3 ++- test/e2e/common/util.go | 5 ---- 16 files changed, 83 insertions(+), 78 deletions(-) diff --git a/test/e2e/common/apparmor.go b/test/e2e/common/apparmor.go index 5cb4728a858..395c8d57333 100644 --- a/test/e2e/common/apparmor.go +++ b/test/e2e/common/apparmor.go @@ -117,7 +117,7 @@ done`, testCmd) Affinity: loaderAffinity, Containers: []api.Container{{ Name: "test", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", testCmd}, }}, RestartPolicy: api.RestartPolicyNever, diff --git a/test/e2e/common/configmap.go b/test/e2e/common/configmap.go index 90e15c84a04..829245fd856 100644 --- a/test/e2e/common/configmap.go +++ b/test/e2e/common/configmap.go @@ -24,6 +24,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" ) var _ = Describe("[sig-api-machinery] ConfigMap", func() { @@ -51,7 +52,7 @@ var _ = Describe("[sig-api-machinery] ConfigMap", func() { Containers: []v1.Container{ { Name: "env-test", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, Env: []v1.EnvVar{ { @@ -99,7 +100,7 @@ var _ = Describe("[sig-api-machinery] ConfigMap", func() { Containers: []v1.Container{ { Name: "env-test", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, EnvFrom: []v1.EnvFromSource{ { diff --git a/test/e2e/common/configmap_volume.go b/test/e2e/common/configmap_volume.go index 81b98d95748..4d5509c1f48 100644 --- a/test/e2e/common/configmap_volume.go +++ b/test/e2e/common/configmap_volume.go @@ -152,7 +152,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { Containers: []v1.Container{ { Name: containerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/configmap-volume/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -234,7 +234,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { Containers: []v1.Container{ { Name: containerName1, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/configmap-volume/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -380,7 +380,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { Containers: []v1.Container{ { Name: deleteContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/configmap-volumes/delete/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -392,7 +392,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { }, { Name: updateContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/configmap-volumes/update/data-3"}, VolumeMounts: []v1.VolumeMount{ { @@ -404,7 +404,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { }, { Name: createContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/configmap-volumes/create/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -510,7 +510,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() { Containers: []v1.Container{ { Name: "configmap-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{"--file_content=/etc/configmap-volume/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -590,7 +590,7 @@ func doConfigMapE2EWithoutMappings(f *framework.Framework, uid, fsGroup int64, d Containers: []v1.Container{ { Name: "configmap-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{ "--file_content=/etc/configmap-volume/data-1", "--file_mode=/etc/configmap-volume/data-1"}, @@ -676,7 +676,7 @@ func doConfigMapE2EWithMappings(f *framework.Framework, uid, fsGroup int64, item Containers: []v1.Container{ { Name: "configmap-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{"--file_content=/etc/configmap-volume/path/to/data-2", "--file_mode=/etc/configmap-volume/path/to/data-2"}, VolumeMounts: []v1.VolumeMount{ diff --git a/test/e2e/common/container_probe.go b/test/e2e/common/container_probe.go index 4ae6d37aae2..e34de694ce1 100644 --- a/test/e2e/common/container_probe.go +++ b/test/e2e/common/container_probe.go @@ -122,7 +122,7 @@ var _ = framework.KubeDescribe("Probing container", func() { Containers: []v1.Container{ { Name: "liveness", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 10; rm -rf /tmp/health; sleep 600"}, LivenessProbe: &v1.Probe{ Handler: v1.Handler{ @@ -154,7 +154,7 @@ var _ = framework.KubeDescribe("Probing container", func() { Containers: []v1.Container{ { Name: "liveness", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/sh", "-c", "echo ok >/tmp/health; sleep 600"}, LivenessProbe: &v1.Probe{ Handler: v1.Handler{ @@ -289,7 +289,7 @@ var _ = framework.KubeDescribe("Probing container", func() { Containers: []v1.Container{ { Name: "liveness", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/sh", "-c", "sleep 600"}, LivenessProbe: &v1.Probe{ Handler: v1.Handler{ diff --git a/test/e2e/common/downward_api.go b/test/e2e/common/downward_api.go index 7d276a1a417..2f779e9a77b 100644 --- a/test/e2e/common/downward_api.go +++ b/test/e2e/common/downward_api.go @@ -25,6 +25,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" utilversion "k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" ) @@ -199,7 +200,7 @@ var _ = Describe("[sig-api-machinery] Downward API", func() { Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, Env: env, }, @@ -299,7 +300,7 @@ var _ = framework.KubeDescribe("Downward API [Serial] [Disruptive] [NodeFeature: Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, Env: env, }, @@ -324,7 +325,7 @@ func testDownwardAPI(f *framework.Framework, podName string, env []v1.EnvVar, ex Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ @@ -356,7 +357,7 @@ func testDownwardAPIForEphemeralStorage(f *framework.Framework, podName string, Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ diff --git a/test/e2e/common/downwardapi_volume.go b/test/e2e/common/downwardapi_volume.go index 4768a320537..9b8c52842ad 100644 --- a/test/e2e/common/downwardapi_volume.go +++ b/test/e2e/common/downwardapi_volume.go @@ -25,6 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -266,7 +267,7 @@ func downwardAPIVolumePodForModeTest(name, filePath string, itemMode, defaultMod pod.Spec.Containers = []v1.Container{ { Name: "client-container", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--file_mode=" + filePath}, VolumeMounts: []v1.VolumeMount{ { @@ -292,7 +293,7 @@ func downwardAPIVolumePodForSimpleTest(name string, filePath string) *v1.Pod { pod.Spec.Containers = []v1.Container{ { Name: "client-container", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--file_content=" + filePath}, VolumeMounts: []v1.VolumeMount{ { @@ -323,7 +324,7 @@ func downwardAPIVolumeBaseContainers(name, filePath string) []v1.Container { return []v1.Container{ { Name: name, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--file_content=" + filePath}, Resources: v1.ResourceRequirements{ Requests: v1.ResourceList{ @@ -351,7 +352,7 @@ func downwardAPIVolumeDefaultBaseContainer(name, filePath string) []v1.Container return []v1.Container{ { Name: name, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--file_content=" + filePath}, VolumeMounts: []v1.VolumeMount{ { @@ -370,7 +371,7 @@ func downwardAPIVolumePodForUpdateTest(name string, labels, annotations map[stri pod.Spec.Containers = []v1.Container{ { Name: "client-container", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=120", "--file_content_in_loop=" + filePath}, VolumeMounts: []v1.VolumeMount{ { diff --git a/test/e2e/common/expansion.go b/test/e2e/common/expansion.go index 42578f2e446..71f0bf13b67 100644 --- a/test/e2e/common/expansion.go +++ b/test/e2e/common/expansion.go @@ -21,6 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -48,7 +49,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() { Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, Env: []v1.EnvVar{ { @@ -93,7 +94,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() { Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "TEST_VAR=wrong echo \"$(TEST_VAR)\""}, Env: []v1.EnvVar{ { @@ -128,7 +129,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() { Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c"}, Args: []string{"TEST_VAR=wrong echo \"$(TEST_VAR)\""}, Env: []v1.EnvVar{ @@ -164,7 +165,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() { Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "test -d /testcontainer/" + podName + ";echo $?"}, Env: []v1.EnvVar{ { @@ -225,7 +226,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() { Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Env: []v1.EnvVar{ { Name: "POD_NAME", @@ -274,7 +275,7 @@ var _ = framework.KubeDescribe("Variable Expansion", func() { Containers: []v1.Container{ { Name: "dapi-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Env: []v1.EnvVar{ { Name: "POD_NAME", diff --git a/test/e2e/common/host_path.go b/test/e2e/common/host_path.go index 7f161d884c1..a9ddfe1363c 100644 --- a/test/e2e/common/host_path.go +++ b/test/e2e/common/host_path.go @@ -24,6 +24,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" ) @@ -239,7 +240,7 @@ func testPodWithHostVol(path string, source *v1.HostPathVolumeSource) *v1.Pod { Containers: []v1.Container{ { Name: containerName1, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), VolumeMounts: []v1.VolumeMount{ { Name: volumeName, @@ -252,7 +253,7 @@ func testPodWithHostVol(path string, source *v1.HostPathVolumeSource) *v1.Pod { }, { Name: containerName2, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), VolumeMounts: []v1.VolumeMount{ { Name: volumeName, diff --git a/test/e2e/common/init_container.go b/test/e2e/common/init_container.go index 698d48157f5..0e470ccd515 100644 --- a/test/e2e/common/init_container.go +++ b/test/e2e/common/init_container.go @@ -67,19 +67,19 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { InitContainers: []v1.Container{ { Name: "init1", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/true"}, }, { Name: "init2", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/true"}, }, }, Containers: []v1.Container{ { Name: "run1", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/true"}, }, }, @@ -131,12 +131,12 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { InitContainers: []v1.Container{ { Name: "init1", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/true"}, }, { Name: "init2", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/true"}, }, }, @@ -201,12 +201,12 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { InitContainers: []v1.Container{ { Name: "init1", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/false"}, }, { Name: "init2", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/true"}, }, }, @@ -315,19 +315,19 @@ var _ = framework.KubeDescribe("InitContainer [NodeConformance]", func() { InitContainers: []v1.Container{ { Name: "init1", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/true"}, }, { Name: "init2", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/false"}, }, }, Containers: []v1.Container{ { Name: "run1", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/true"}, Resources: v1.ResourceRequirements{ Limits: v1.ResourceList{ diff --git a/test/e2e/common/pods.go b/test/e2e/common/pods.go index b0268efc0db..d4401c78a86 100644 --- a/test/e2e/common/pods.go +++ b/test/e2e/common/pods.go @@ -442,7 +442,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []v1.Container{ { Name: containerName, - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, }, }, @@ -481,7 +481,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []v1.Container{ { Name: "main", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 600"}, }, }, @@ -557,7 +557,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []v1.Container{ { Name: "main", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/sh", "-c", "echo container is alive; sleep 10000"}, }, }, @@ -612,7 +612,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []v1.Container{ { Name: containerName, - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/sh", "-c", "sleep 5", "/crash/missing"}, }, }, @@ -653,7 +653,7 @@ var _ = framework.KubeDescribe("Pods", func() { Containers: []v1.Container{ { Name: containerName, - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"/bin/sh", "-c", "sleep 5", "/crash/missing"}, }, }, diff --git a/test/e2e/common/privileged.go b/test/e2e/common/privileged.go index 76757a90a97..da679ba8fb1 100644 --- a/test/e2e/common/privileged.go +++ b/test/e2e/common/privileged.go @@ -24,6 +24,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" ) type PrivilegedPodTestConfig struct { @@ -90,14 +91,14 @@ func (c *PrivilegedPodTestConfig) createPodsSpec() *v1.Pod { Containers: []v1.Container{ { Name: c.privilegedContainer, - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), ImagePullPolicy: v1.PullIfNotPresent, SecurityContext: &v1.SecurityContext{Privileged: &isPrivileged}, Command: []string{"/bin/sleep", "10000"}, }, { Name: c.notPrivilegedContainer, - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), ImagePullPolicy: v1.PullIfNotPresent, SecurityContext: &v1.SecurityContext{Privileged: ¬Privileged}, Command: []string{"/bin/sleep", "10000"}, diff --git a/test/e2e/common/projected.go b/test/e2e/common/projected.go index d33e690284d..e65c20b5c36 100644 --- a/test/e2e/common/projected.go +++ b/test/e2e/common/projected.go @@ -26,6 +26,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -172,7 +173,7 @@ var _ = Describe("[sig-storage] Projected", func() { Containers: []v1.Container{ { Name: "secret-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{ "--file_content=/etc/projected-secret-volume/data-1", "--file_mode=/etc/projected-secret-volume/data-1"}, @@ -322,7 +323,7 @@ var _ = Describe("[sig-storage] Projected", func() { Containers: []v1.Container{ { Name: deleteContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/projected-secret-volumes/delete/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -334,7 +335,7 @@ var _ = Describe("[sig-storage] Projected", func() { }, { Name: updateContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/projected-secret-volumes/update/data-3"}, VolumeMounts: []v1.VolumeMount{ { @@ -346,7 +347,7 @@ var _ = Describe("[sig-storage] Projected", func() { }, { Name: createContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/projected-secret-volumes/create/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -526,7 +527,7 @@ var _ = Describe("[sig-storage] Projected", func() { Containers: []v1.Container{ { Name: containerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/projected-configmap-volume/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -681,7 +682,7 @@ var _ = Describe("[sig-storage] Projected", func() { Containers: []v1.Container{ { Name: deleteContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/projected-configmap-volumes/delete/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -693,7 +694,7 @@ var _ = Describe("[sig-storage] Projected", func() { }, { Name: updateContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/projected-configmap-volumes/update/data-3"}, VolumeMounts: []v1.VolumeMount{ { @@ -705,7 +706,7 @@ var _ = Describe("[sig-storage] Projected", func() { }, { Name: createContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/projected-configmap-volumes/create/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -824,7 +825,7 @@ var _ = Describe("[sig-storage] Projected", func() { Containers: []v1.Container{ { Name: "projected-configmap-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{"--file_content=/etc/projected-configmap-volume/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -1120,7 +1121,7 @@ var _ = Describe("[sig-storage] Projected", func() { pod.Spec.Containers = []v1.Container{ { Name: "projected-all-volume-test", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "cat /all/podname && cat /all/secret-data && cat /all/configmap-data"}, VolumeMounts: []v1.VolumeMount{ { @@ -1180,7 +1181,7 @@ func doProjectedSecretE2EWithoutMapping(f *framework.Framework, defaultMode *int Containers: []v1.Container{ { Name: "projected-secret-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{ "--file_content=/etc/projected-secret-volume/data-1", "--file_mode=/etc/projected-secret-volume/data-1"}, @@ -1266,7 +1267,7 @@ func doProjectedSecretE2EWithMapping(f *framework.Framework, mode *int32) { Containers: []v1.Container{ { Name: "projected-secret-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{ "--file_content=/etc/projected-secret-volume/new-path-data-1", "--file_mode=/etc/projected-secret-volume/new-path-data-1"}, @@ -1343,7 +1344,7 @@ func doProjectedConfigMapE2EWithoutMappings(f *framework.Framework, uid, fsGroup Containers: []v1.Container{ { Name: "projected-configmap-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{ "--file_content=/etc/projected-configmap-volume/data-1", "--file_mode=/etc/projected-configmap-volume/data-1"}, @@ -1434,7 +1435,7 @@ func doProjectedConfigMapE2EWithMappings(f *framework.Framework, uid, fsGroup in Containers: []v1.Container{ { Name: "projected-configmap-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{"--file_content=/etc/projected-configmap-volume/path/to/data-2", "--file_mode=/etc/projected-configmap-volume/path/to/data-2"}, VolumeMounts: []v1.VolumeMount{ @@ -1484,7 +1485,7 @@ func projectedDownwardAPIVolumePodForModeTest(name, filePath string, itemMode, d pod.Spec.Containers = []v1.Container{ { Name: "client-container", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--file_mode=" + filePath}, VolumeMounts: []v1.VolumeMount{ { @@ -1510,7 +1511,7 @@ func projectedDownwardAPIVolumePodForUpdateTest(name string, labels, annotations pod.Spec.Containers = []v1.Container{ { Name: "client-container", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", "--retry_time=1200", "--file_content_in_loop=" + filePath}, VolumeMounts: []v1.VolumeMount{ { diff --git a/test/e2e/common/secrets.go b/test/e2e/common/secrets.go index 50282ca7746..4da60718fd6 100644 --- a/test/e2e/common/secrets.go +++ b/test/e2e/common/secrets.go @@ -23,6 +23,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" ) @@ -53,7 +54,7 @@ var _ = Describe("[sig-api-machinery] Secrets", func() { Containers: []v1.Container{ { Name: "secret-env-test", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, Env: []v1.EnvVar{ { @@ -101,7 +102,7 @@ var _ = Describe("[sig-api-machinery] Secrets", func() { Containers: []v1.Container{ { Name: "env-test", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), Command: []string{"sh", "-c", "env"}, EnvFrom: []v1.EnvFromSource{ { diff --git a/test/e2e/common/secrets_volume.go b/test/e2e/common/secrets_volume.go index 4f4577b9d5c..60f6856a8a3 100644 --- a/test/e2e/common/secrets_volume.go +++ b/test/e2e/common/secrets_volume.go @@ -25,6 +25,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -154,7 +155,7 @@ var _ = Describe("[sig-storage] Secrets", func() { Containers: []v1.Container{ { Name: "secret-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{ "--file_content=/etc/secret-volume/data-1", "--file_mode=/etc/secret-volume/data-1"}, @@ -280,7 +281,7 @@ var _ = Describe("[sig-storage] Secrets", func() { Containers: []v1.Container{ { Name: deleteContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/secret-volumes/delete/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -292,7 +293,7 @@ var _ = Describe("[sig-storage] Secrets", func() { }, { Name: updateContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/secret-volumes/update/data-3"}, VolumeMounts: []v1.VolumeMount{ { @@ -304,7 +305,7 @@ var _ = Describe("[sig-storage] Secrets", func() { }, { Name: createContainerName, - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Command: []string{"/mounttest", "--break_on_expected_content=false", containerTimeoutArg, "--file_content_in_loop=/etc/secret-volumes/create/data-1"}, VolumeMounts: []v1.VolumeMount{ { @@ -407,7 +408,7 @@ func doSecretE2EWithoutMapping(f *framework.Framework, defaultMode *int32, secre Containers: []v1.Container{ { Name: "secret-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{ "--file_content=/etc/secret-volume/data-1", "--file_mode=/etc/secret-volume/data-1"}, @@ -484,7 +485,7 @@ func doSecretE2EWithMapping(f *framework.Framework, mode *int32) { Containers: []v1.Container{ { Name: "secret-volume-test", - Image: mountImage, + Image: imageutils.GetE2EImage(imageutils.Mounttest), Args: []string{ "--file_content=/etc/secret-volume/new-path-data-1", "--file_mode=/etc/secret-volume/new-path-data-1"}, diff --git a/test/e2e/common/sysctl.go b/test/e2e/common/sysctl.go index 6ae2c5a0e85..2d8ef72a6c7 100644 --- a/test/e2e/common/sysctl.go +++ b/test/e2e/common/sysctl.go @@ -22,6 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/kubernetes/pkg/kubelet/sysctl" "k8s.io/kubernetes/test/e2e/framework" + imageutils "k8s.io/kubernetes/test/utils/image" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" @@ -42,7 +43,7 @@ var _ = framework.KubeDescribe("Sysctls [NodeFeature:Sysctls]", func() { Containers: []v1.Container{ { Name: "test-container", - Image: busyboxImage, + Image: imageutils.GetE2EImage(imageutils.BusyBox), }, }, RestartPolicy: v1.RestartPolicyNever, diff --git a/test/e2e/common/util.go b/test/e2e/common/util.go index b73909db470..b3d87b4e267 100644 --- a/test/e2e/common/util.go +++ b/test/e2e/common/util.go @@ -40,11 +40,6 @@ const ( NodeE2E Suite = "node e2e" ) -var ( - mountImage = imageutils.GetE2EImage(imageutils.Mounttest) - busyboxImage = imageutils.GetE2EImage(imageutils.BusyBox) -) - var CurrentSuite Suite // CommonImageWhiteList is the list of images used in common test. These images should be prepulled