mirror of https://github.com/k3s-io/k3s
e2e test harness - use busybox from dockerhub
Use the same pattern everywhere in the e2e test harness, use busybox (from dockerhub) instead of using the one from k8s.gcr.io registry. Change-Id: I57c3b867408c1f9478a8909c26744ea0368ff003pull/8/head
parent
a945b5d928
commit
6cd8bd62fe
|
@ -312,7 +312,7 @@ func newCronJob(name, schedule string) *batchv1beta1.CronJob {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "c",
|
Name: "c",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"sleep", "300"},
|
Command: []string{"sleep", "300"},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -243,7 +243,7 @@ func newTestingCronJob(name string, value string) *batchv1beta1.CronJob {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "c",
|
Name: "c",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
{
|
{
|
||||||
MountPath: "/data",
|
MountPath: "/data",
|
||||||
|
|
|
@ -34,6 +34,7 @@ import (
|
||||||
batchinternal "k8s.io/kubernetes/pkg/apis/batch"
|
batchinternal "k8s.io/kubernetes/pkg/apis/batch"
|
||||||
"k8s.io/kubernetes/pkg/controller/job"
|
"k8s.io/kubernetes/pkg/controller/job"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -298,7 +299,7 @@ func newTestCronJob(name, schedule string, concurrencyPolicy batchv1beta1.Concur
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "c",
|
Name: "c",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
{
|
{
|
||||||
MountPath: "/data",
|
MountPath: "/data",
|
||||||
|
|
|
@ -27,6 +27,7 @@ import (
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/uuid"
|
"k8s.io/apimachinery/pkg/util/uuid"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ = Describe("[sig-storage] ConfigMap", func() {
|
var _ = Describe("[sig-storage] ConfigMap", func() {
|
||||||
|
@ -245,7 +246,7 @@ var _ = Describe("[sig-storage] ConfigMap", func() {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: containerName2,
|
Name: containerName2,
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"hexdump", "-C", "/etc/configmap-volume/dump.bin"},
|
Command: []string{"hexdump", "-C", "/etc/configmap-volume/dump.bin"},
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
{
|
{
|
||||||
|
|
|
@ -42,7 +42,7 @@ const (
|
||||||
|
|
||||||
var (
|
var (
|
||||||
mountImage = imageutils.GetE2EImage(imageutils.Mounttest)
|
mountImage = imageutils.GetE2EImage(imageutils.Mounttest)
|
||||||
busyboxImage = "busybox"
|
busyboxImage = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
)
|
)
|
||||||
|
|
||||||
var CurrentSuite Suite
|
var CurrentSuite Suite
|
||||||
|
@ -52,7 +52,7 @@ var CurrentSuite Suite
|
||||||
// only used by node e2e test.
|
// only used by node e2e test.
|
||||||
// TODO(random-liu): Change the image puller pod to use similar mechanism.
|
// TODO(random-liu): Change the image puller pod to use similar mechanism.
|
||||||
var CommonImageWhiteList = sets.NewString(
|
var CommonImageWhiteList = sets.NewString(
|
||||||
"busybox",
|
imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
imageutils.GetE2EImage(imageutils.EntrypointTester),
|
imageutils.GetE2EImage(imageutils.EntrypointTester),
|
||||||
imageutils.GetE2EImage(imageutils.IpcUtils),
|
imageutils.GetE2EImage(imageutils.IpcUtils),
|
||||||
imageutils.GetE2EImage(imageutils.Liveness),
|
imageutils.GetE2EImage(imageutils.Liveness),
|
||||||
|
|
|
@ -33,6 +33,7 @@ import (
|
||||||
appsinternal "k8s.io/kubernetes/pkg/apis/apps"
|
appsinternal "k8s.io/kubernetes/pkg/apis/apps"
|
||||||
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
|
deploymentutil "k8s.io/kubernetes/pkg/controller/deployment/util"
|
||||||
testutils "k8s.io/kubernetes/test/utils"
|
testutils "k8s.io/kubernetes/test/utils"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
func UpdateDeploymentWithRetries(c clientset.Interface, namespace, name string, applyUpdate testutils.UpdateDeploymentFunc) (*apps.Deployment, error) {
|
func UpdateDeploymentWithRetries(c clientset.Interface, namespace, name string, applyUpdate testutils.UpdateDeploymentFunc) (*apps.Deployment, error) {
|
||||||
|
@ -255,7 +256,7 @@ func MakeDeployment(replicas int32, podLabels map[string]string, nodeSelector ma
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "write-pod",
|
Name: "write-pod",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sh"},
|
Command: []string{"/bin/sh"},
|
||||||
Args: []string{"-c", command},
|
Args: []string{"-c", command},
|
||||||
SecurityContext: &v1.SecurityContext{
|
SecurityContext: &v1.SecurityContext{
|
||||||
|
|
|
@ -209,7 +209,7 @@ const (
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
BusyBoxImage = "busybox"
|
BusyBoxImage = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
// Label allocated to the image puller static pod that runs on each node
|
// Label allocated to the image puller static pod that runs on each node
|
||||||
// before e2es.
|
// before e2es.
|
||||||
ImagePullerLabels = map[string]string{"name": "e2e-image-puller"}
|
ImagePullerLabels = map[string]string{"name": "e2e-image-puller"}
|
||||||
|
|
|
@ -18,6 +18,7 @@ go_library(
|
||||||
"//test/e2e/instrumentation/common:go_default_library",
|
"//test/e2e/instrumentation/common:go_default_library",
|
||||||
"//test/e2e/instrumentation/logging/elasticsearch:go_default_library",
|
"//test/e2e/instrumentation/logging/elasticsearch:go_default_library",
|
||||||
"//test/e2e/instrumentation/logging/stackdriver:go_default_library",
|
"//test/e2e/instrumentation/logging/stackdriver:go_default_library",
|
||||||
|
"//test/utils/image:go_default_library",
|
||||||
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||||
"//vendor/github.com/onsi/gomega:go_default_library",
|
"//vendor/github.com/onsi/gomega:go_default_library",
|
||||||
],
|
],
|
||||||
|
|
|
@ -28,6 +28,7 @@ import (
|
||||||
"k8s.io/api/core/v1"
|
"k8s.io/api/core/v1"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
|
instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disruptive]", func() {
|
var _ = instrumentation.SIGDescribe("Logging soak [Performance] [Slow] [Disruptive]", func() {
|
||||||
|
@ -100,7 +101,7 @@ func RunLogPodsWithSleepOf(f *framework.Framework, sleep time.Duration, podname
|
||||||
return v1.PodSpec{
|
return v1.PodSpec{
|
||||||
Containers: []v1.Container{{
|
Containers: []v1.Container{{
|
||||||
Name: "logging-soak",
|
Name: "logging-soak",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Args: []string{
|
Args: []string{
|
||||||
"/bin/sh",
|
"/bin/sh",
|
||||||
"-c",
|
"-c",
|
||||||
|
|
|
@ -177,7 +177,7 @@ func (p *execLoggingPod) Start(f *framework.Framework) error {
|
||||||
Containers: []api_v1.Container{
|
Containers: []api_v1.Container{
|
||||||
{
|
{
|
||||||
Name: loggingContainerName,
|
Name: loggingContainerName,
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: p.cmd,
|
Command: p.cmd,
|
||||||
Resources: api_v1.ResourceRequirements{
|
Resources: api_v1.ResourceRequirements{
|
||||||
Requests: api_v1.ResourceList{
|
Requests: api_v1.ResourceList{
|
||||||
|
|
|
@ -94,7 +94,7 @@ var (
|
||||||
kittenImage = imageutils.GetE2EImage(imageutils.Kitten)
|
kittenImage = imageutils.GetE2EImage(imageutils.Kitten)
|
||||||
redisImage = imageutils.GetE2EImage(imageutils.Redis)
|
redisImage = imageutils.GetE2EImage(imageutils.Redis)
|
||||||
nginxImage = imageutils.GetE2EImage(imageutils.Nginx)
|
nginxImage = imageutils.GetE2EImage(imageutils.Nginx)
|
||||||
busyboxImage = "busybox"
|
busyboxImage = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
)
|
)
|
||||||
|
|
||||||
var testImages = struct {
|
var testImages = struct {
|
||||||
|
|
|
@ -556,7 +556,7 @@ func createNetworkClientPod(f *framework.Framework, namespace *v1.Namespace, pod
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: fmt.Sprintf("%s-container", podName),
|
Name: fmt.Sprintf("%s-container", podName),
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Args: []string{
|
Args: []string{
|
||||||
"/bin/sh",
|
"/bin/sh",
|
||||||
"-c",
|
"-c",
|
||||||
|
|
|
@ -133,7 +133,7 @@ func createPodUsingNfs(f *framework.Framework, c clientset.Interface, ns, nfsIP,
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "pod-nfs-vol",
|
Name: "pod-nfs-vol",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sh"},
|
Command: []string{"/bin/sh"},
|
||||||
Args: cmdLine,
|
Args: cmdLine,
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
|
|
|
@ -23,6 +23,7 @@ import (
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/sets"
|
"k8s.io/apimachinery/pkg/util/sets"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
. "github.com/onsi/gomega"
|
. "github.com/onsi/gomega"
|
||||||
|
@ -43,7 +44,7 @@ func preparePod(name string, node *v1.Node, propagation *v1.MountPropagationMode
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: containerName,
|
Name: containerName,
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"sh", "-c", cmd},
|
Command: []string{"sh", "-c", cmd},
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
{
|
{
|
||||||
|
|
|
@ -27,6 +27,7 @@ import (
|
||||||
"k8s.io/apimachinery/pkg/util/uuid"
|
"k8s.io/apimachinery/pkg/util/uuid"
|
||||||
"k8s.io/apimachinery/pkg/util/wait"
|
"k8s.io/apimachinery/pkg/util/wait"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
// This test requires that --terminated-pod-gc-threshold=100 be set on the controller manager
|
// This test requires that --terminated-pod-gc-threshold=100 be set on the controller manager
|
||||||
|
@ -89,7 +90,7 @@ func createTerminatingPod(f *framework.Framework) (*v1.Pod, error) {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: string(uuid),
|
Name: string(uuid),
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
SchedulerName: "please don't schedule my pods",
|
SchedulerName: "please don't schedule my pods",
|
||||||
|
|
|
@ -80,7 +80,7 @@ func testPreStop(c clientset.Interface, ns string) {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "tester",
|
Name: "tester",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"sleep", "600"},
|
Command: []string{"sleep", "600"},
|
||||||
Lifecycle: &v1.Lifecycle{
|
Lifecycle: &v1.Lifecycle{
|
||||||
PreStop: &v1.Handler{
|
PreStop: &v1.Handler{
|
||||||
|
|
|
@ -29,6 +29,7 @@ import (
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
"k8s.io/apimachinery/pkg/util/uuid"
|
"k8s.io/apimachinery/pkg/util/uuid"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
|
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
. "github.com/onsi/gomega"
|
. "github.com/onsi/gomega"
|
||||||
|
@ -49,7 +50,7 @@ func scTestPod(hostIPC bool, hostPID bool) *v1.Pod {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "test-container",
|
Name: "test-container",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
RestartPolicy: v1.RestartPolicyNever,
|
RestartPolicy: v1.RestartPolicyNever,
|
||||||
|
|
|
@ -353,7 +353,7 @@ func testNoWrappedVolumeRace(f *framework.Framework, volumes []v1.Volume, volume
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "test-container",
|
Name: "test-container",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"sleep", "10000"},
|
Command: []string{"sleep", "10000"},
|
||||||
Resources: v1.ResourceRequirements{
|
Resources: v1.ResourceRequirements{
|
||||||
Requests: v1.ResourceList{
|
Requests: v1.ResourceList{
|
||||||
|
|
|
@ -40,6 +40,7 @@ import (
|
||||||
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
|
v1core "k8s.io/client-go/kubernetes/typed/core/v1"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
"k8s.io/kubernetes/test/e2e/storage/utils"
|
"k8s.io/kubernetes/test/e2e/storage/utils"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -526,7 +527,7 @@ func testPDPod(diskNames []string, targetNode types.NodeName, readOnly bool, num
|
||||||
if numContainers > 1 {
|
if numContainers > 1 {
|
||||||
containers[i].Name = fmt.Sprintf("mycontainer%v", i+1)
|
containers[i].Name = fmt.Sprintf("mycontainer%v", i+1)
|
||||||
}
|
}
|
||||||
containers[i].Image = "busybox"
|
containers[i].Image = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
containers[i].Command = []string{"sleep", "6000"}
|
containers[i].Command = []string{"sleep", "6000"}
|
||||||
containers[i].VolumeMounts = make([]v1.VolumeMount, len(diskNames))
|
containers[i].VolumeMounts = make([]v1.VolumeMount, len(diskNames))
|
||||||
for k := range diskNames {
|
for k := range diskNames {
|
||||||
|
|
|
@ -37,6 +37,7 @@ import (
|
||||||
"k8s.io/kubernetes/pkg/volume/util"
|
"k8s.io/kubernetes/pkg/volume/util"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
"k8s.io/kubernetes/test/e2e/storage/utils"
|
"k8s.io/kubernetes/test/e2e/storage/utils"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -334,7 +335,7 @@ func newPodTemplate(labels map[string]string) *v1.PodTemplateSpec {
|
||||||
// and prints the entire file to stdout.
|
// and prints the entire file to stdout.
|
||||||
{
|
{
|
||||||
Name: "busybox",
|
Name: "busybox",
|
||||||
Image: "k8s.gcr.io/busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"sh", "-c"},
|
Command: []string{"sh", "-c"},
|
||||||
Args: []string{
|
Args: []string{
|
||||||
"echo ${POD_NAME} >> /mnt/data/regional-pd/pods.txt;" +
|
"echo ${POD_NAME} >> /mnt/data/regional-pd/pods.txt;" +
|
||||||
|
|
|
@ -396,7 +396,7 @@ func testPodSubpath(f *framework.Framework, subpath, volumeType string, source *
|
||||||
InitContainers: []v1.Container{
|
InitContainers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: fmt.Sprintf("init-volume-%s", suffix),
|
Name: fmt.Sprintf("init-volume-%s", suffix),
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
{
|
{
|
||||||
Name: volumeName,
|
Name: volumeName,
|
||||||
|
@ -561,9 +561,9 @@ func testPodFailSubpathError(f *framework.Framework, pod *v1.Pod, errorMsg strin
|
||||||
func testPodContainerRestart(f *framework.Framework, pod *v1.Pod) {
|
func testPodContainerRestart(f *framework.Framework, pod *v1.Pod) {
|
||||||
pod.Spec.RestartPolicy = v1.RestartPolicyOnFailure
|
pod.Spec.RestartPolicy = v1.RestartPolicyOnFailure
|
||||||
|
|
||||||
pod.Spec.Containers[0].Image = "busybox"
|
pod.Spec.Containers[0].Image = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
pod.Spec.Containers[0].Command = []string{"/bin/sh", "-ec", "sleep 100000"}
|
pod.Spec.Containers[0].Command = []string{"/bin/sh", "-ec", "sleep 100000"}
|
||||||
pod.Spec.Containers[1].Image = "busybox"
|
pod.Spec.Containers[1].Image = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
pod.Spec.Containers[1].Command = []string{"/bin/sh", "-ec", "sleep 100000"}
|
pod.Spec.Containers[1].Command = []string{"/bin/sh", "-ec", "sleep 100000"}
|
||||||
|
|
||||||
// Add liveness probe to subpath container
|
// Add liveness probe to subpath container
|
||||||
|
@ -654,9 +654,9 @@ func testSubpathReconstruction(f *framework.Framework, pod *v1.Pod, forceDelete
|
||||||
// This is mostly copied from TestVolumeUnmountsFromDeletedPodWithForceOption()
|
// This is mostly copied from TestVolumeUnmountsFromDeletedPodWithForceOption()
|
||||||
|
|
||||||
// Change to busybox
|
// Change to busybox
|
||||||
pod.Spec.Containers[0].Image = "busybox"
|
pod.Spec.Containers[0].Image = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
pod.Spec.Containers[0].Command = []string{"/bin/sh", "-ec", "sleep 100000"}
|
pod.Spec.Containers[0].Command = []string{"/bin/sh", "-ec", "sleep 100000"}
|
||||||
pod.Spec.Containers[1].Image = "busybox"
|
pod.Spec.Containers[1].Image = imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
pod.Spec.Containers[1].Command = []string{"/bin/sh", "-ec", "sleep 100000"}
|
pod.Spec.Containers[1].Command = []string{"/bin/sh", "-ec", "sleep 100000"}
|
||||||
|
|
||||||
// If grace period is too short, then there is not enough time for the volume
|
// If grace period is too short, then there is not enough time for the volume
|
||||||
|
@ -749,7 +749,7 @@ func (s *hostpathSymlinkSource) createVolume(f *framework.Framework) volInfo {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: fmt.Sprintf("init-volume-%s", f.Namespace.Name),
|
Name: fmt.Sprintf("init-volume-%s", f.Namespace.Name),
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sh", "-ec", cmd},
|
Command: []string{"/bin/sh", "-ec", cmd},
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
{
|
{
|
||||||
|
@ -857,7 +857,7 @@ func (s *gcepdPVCSource) createVolume(f *framework.Framework) volInfo {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: fmt.Sprintf("init-volume-%s", f.Namespace.Name),
|
Name: fmt.Sprintf("init-volume-%s", f.Namespace.Name),
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sh", "-ec", "echo nothing"},
|
Command: []string{"/bin/sh", "-ec", "echo nothing"},
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
{
|
{
|
||||||
|
|
|
@ -17,6 +17,7 @@ go_library(
|
||||||
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
|
||||||
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
||||||
"//test/e2e/framework:go_default_library",
|
"//test/e2e/framework:go_default_library",
|
||||||
|
"//test/utils/image:go_default_library",
|
||||||
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||||
"//vendor/github.com/onsi/gomega:go_default_library",
|
"//vendor/github.com/onsi/gomega:go_default_library",
|
||||||
"//vendor/k8s.io/utils/exec:go_default_library",
|
"//vendor/k8s.io/utils/exec:go_default_library",
|
||||||
|
|
|
@ -27,6 +27,7 @@ import (
|
||||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||||
clientset "k8s.io/client-go/kubernetes"
|
clientset "k8s.io/client-go/kubernetes"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
uexec "k8s.io/utils/exec"
|
uexec "k8s.io/utils/exec"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -280,7 +281,7 @@ func RunInPodWithVolume(c clientset.Interface, ns, claimName, command string) {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "volume-tester",
|
Name: "volume-tester",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sh"},
|
Command: []string{"/bin/sh"},
|
||||||
Args: []string{"-c", command},
|
Args: []string{"-c", command},
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
|
|
|
@ -45,6 +45,7 @@ import (
|
||||||
storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
|
storageutil "k8s.io/kubernetes/pkg/apis/storage/v1/util"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
"k8s.io/kubernetes/test/e2e/storage/utils"
|
"k8s.io/kubernetes/test/e2e/storage/utils"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
type storageClassTest struct {
|
type storageClassTest struct {
|
||||||
|
@ -962,7 +963,7 @@ func runInPodWithVolume(c clientset.Interface, ns, claimName, nodeName, command
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "volume-tester",
|
Name: "volume-tester",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sh"},
|
Command: []string{"/bin/sh"},
|
||||||
Args: []string{"-c", command},
|
Args: []string{"-c", command},
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
|
|
|
@ -51,6 +51,7 @@ go_library(
|
||||||
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
"//staging/src/k8s.io/client-go/kubernetes:go_default_library",
|
||||||
"//test/e2e/framework:go_default_library",
|
"//test/e2e/framework:go_default_library",
|
||||||
"//test/e2e/storage/utils:go_default_library",
|
"//test/e2e/storage/utils:go_default_library",
|
||||||
|
"//test/utils/image:go_default_library",
|
||||||
"//vendor/github.com/golang/glog:go_default_library",
|
"//vendor/github.com/golang/glog:go_default_library",
|
||||||
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
"//vendor/github.com/onsi/ginkgo:go_default_library",
|
||||||
"//vendor/github.com/onsi/gomega:go_default_library",
|
"//vendor/github.com/onsi/gomega:go_default_library",
|
||||||
|
|
|
@ -44,6 +44,7 @@ import (
|
||||||
"k8s.io/kubernetes/pkg/volume/util"
|
"k8s.io/kubernetes/pkg/volume/util"
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
"k8s.io/kubernetes/test/e2e/storage/utils"
|
"k8s.io/kubernetes/test/e2e/storage/utils"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
|
@ -288,7 +289,7 @@ func getVSpherePodSpecWithClaim(claimName string, nodeSelectorKV map[string]stri
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "volume-tester",
|
Name: "volume-tester",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sh"},
|
Command: []string{"/bin/sh"},
|
||||||
Args: []string{"-c", command},
|
Args: []string{"-c", command},
|
||||||
VolumeMounts: []v1.VolumeMount{
|
VolumeMounts: []v1.VolumeMount{
|
||||||
|
@ -353,7 +354,7 @@ func getVSpherePodSpecWithVolumePaths(volumePaths []string, keyValuelabel map[st
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "vsphere-e2e-container-" + string(uuid.NewUUID()),
|
Name: "vsphere-e2e-container-" + string(uuid.NewUUID()),
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: commands,
|
Command: commands,
|
||||||
VolumeMounts: volumeMounts,
|
VolumeMounts: volumeMounts,
|
||||||
},
|
},
|
||||||
|
|
|
@ -118,7 +118,7 @@ func (t *ConfigMapUpgradeTest) testPod(f *framework.Framework) {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "configmap-env-test",
|
Name: "configmap-env-test",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"sh", "-c", "env"},
|
Command: []string{"sh", "-c", "env"},
|
||||||
Env: []v1.EnvVar{
|
Env: []v1.EnvVar{
|
||||||
{
|
{
|
||||||
|
|
|
@ -114,7 +114,7 @@ func (t *SecretUpgradeTest) testPod(f *framework.Framework) {
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "secret-env-test",
|
Name: "secret-env-test",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"sh", "-c", "env"},
|
Command: []string{"sh", "-c", "env"},
|
||||||
Env: []v1.EnvVar{
|
Env: []v1.EnvVar{
|
||||||
{
|
{
|
||||||
|
|
|
@ -29,6 +29,7 @@ import (
|
||||||
"k8s.io/kubernetes/pkg/kubelet/sysctl"
|
"k8s.io/kubernetes/pkg/kubelet/sysctl"
|
||||||
|
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
// SecretUpgradeTest tests that a pod with sysctls runs before and after an upgrade. During
|
// SecretUpgradeTest tests that a pod with sysctls runs before and after an upgrade. During
|
||||||
|
@ -127,7 +128,7 @@ func sysctlTestPod(name string, sysctls map[string]string) *v1.Pod {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "test-container",
|
Name: "test-container",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: append([]string{"/bin/sysctl"}, keys...),
|
Command: append([]string{"/bin/sysctl"}, keys...),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
|
@ -27,6 +27,7 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"k8s.io/kubernetes/test/e2e/framework"
|
"k8s.io/kubernetes/test/e2e/framework"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
|
|
||||||
"github.com/blang/semver"
|
"github.com/blang/semver"
|
||||||
. "github.com/onsi/ginkgo"
|
. "github.com/onsi/ginkgo"
|
||||||
|
@ -170,7 +171,7 @@ func checkDockerConfig() error {
|
||||||
// checkDockerNetworkClient checks client networking by pinging an external IP
|
// checkDockerNetworkClient checks client networking by pinging an external IP
|
||||||
// address from a container.
|
// address from a container.
|
||||||
func checkDockerNetworkClient() error {
|
func checkDockerNetworkClient() error {
|
||||||
const imageName = "k8s.gcr.io/busybox"
|
imageName := imageutils.GetE2EImage(imageutils.BusyBox)
|
||||||
output, err := runCommand("docker", "run", "--rm", imageName, "sh", "-c", "ping -w 5 -q google.com")
|
output, err := runCommand("docker", "run", "--rm", imageName, "sh", "-c", "ping -w 5 -q google.com")
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -50,12 +50,12 @@ var _ = framework.KubeDescribe("Security Context", func() {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "test-container-1",
|
Name: "test-container-1",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/top"},
|
Command: []string{"/bin/top"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "test-container-2",
|
Name: "test-container-2",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sleep"},
|
Command: []string{"/bin/sleep"},
|
||||||
Args: []string{"10000"},
|
Args: []string{"10000"},
|
||||||
},
|
},
|
||||||
|
@ -91,12 +91,12 @@ var _ = framework.KubeDescribe("Security Context", func() {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "test-container-1",
|
Name: "test-container-1",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/top"},
|
Command: []string{"/bin/top"},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
Name: "test-container-2",
|
Name: "test-container-2",
|
||||||
Image: "busybox",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sleep"},
|
Command: []string{"/bin/sleep"},
|
||||||
Args: []string{"10000"},
|
Args: []string{"10000"},
|
||||||
},
|
},
|
||||||
|
|
|
@ -40,6 +40,7 @@ import (
|
||||||
persistentvolumeoptions "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/options"
|
persistentvolumeoptions "k8s.io/kubernetes/pkg/controller/volume/persistentvolume/options"
|
||||||
"k8s.io/kubernetes/pkg/volume"
|
"k8s.io/kubernetes/pkg/volume"
|
||||||
volumetest "k8s.io/kubernetes/pkg/volume/testing"
|
volumetest "k8s.io/kubernetes/pkg/volume/testing"
|
||||||
|
imageutils "k8s.io/kubernetes/test/utils/image"
|
||||||
)
|
)
|
||||||
|
|
||||||
type testConfig struct {
|
type testConfig struct {
|
||||||
|
@ -711,7 +712,7 @@ func makePod(name, ns string, pvcs []string) *v1.Pod {
|
||||||
Containers: []v1.Container{
|
Containers: []v1.Container{
|
||||||
{
|
{
|
||||||
Name: "write-pod",
|
Name: "write-pod",
|
||||||
Image: "k8s.gcr.io/busybox:1.24",
|
Image: imageutils.GetE2EImage(imageutils.BusyBox),
|
||||||
Command: []string{"/bin/sh"},
|
Command: []string{"/bin/sh"},
|
||||||
Args: []string{"-c", "while true; do sleep 1; done"},
|
Args: []string{"-c", "while true; do sleep 1; done"},
|
||||||
},
|
},
|
||||||
|
|
|
@ -52,7 +52,7 @@ var (
|
||||||
AdmissionWebhook = ImageConfig{e2eRegistry, "webhook", "1.12v1", false}
|
AdmissionWebhook = ImageConfig{e2eRegistry, "webhook", "1.12v1", false}
|
||||||
APIServer = ImageConfig{e2eRegistry, "sample-apiserver", "1.0", false}
|
APIServer = ImageConfig{e2eRegistry, "sample-apiserver", "1.0", false}
|
||||||
AppArmorLoader = ImageConfig{gcRegistry, "apparmor-loader", "0.1", false}
|
AppArmorLoader = ImageConfig{gcRegistry, "apparmor-loader", "0.1", false}
|
||||||
BusyBox = ImageConfig{gcRegistry, "busybox", "1.24", false}
|
BusyBox = ImageConfig{dockerHubRegistry, "busybox", "1.29", false}
|
||||||
CheckMetadataConcealment = ImageConfig{gcRegistry, "check-metadata-concealment", "v0.0.3", false}
|
CheckMetadataConcealment = ImageConfig{gcRegistry, "check-metadata-concealment", "v0.0.3", false}
|
||||||
CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0", false}
|
CudaVectorAdd = ImageConfig{e2eRegistry, "cuda-vector-add", "1.0", false}
|
||||||
Dnsutils = ImageConfig{e2eRegistry, "dnsutils", "1.1", false}
|
Dnsutils = ImageConfig{e2eRegistry, "dnsutils", "1.1", false}
|
||||||
|
|
Loading…
Reference in New Issue