github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #31945 from Random-Liu/prepull-common-test-image 

Automatic merge from submit-queue

Add images used in common test into prepull image list.

Addresses https://github.com/kubernetes/kubernetes/issues/31774#issuecomment-243800830.

Fixes #31774, #31579.

This PR added all images in common test into the node e2e prepull list.
Mark P2 because this help get rid of image pulling flake.

@yujuhong
pull/6/head
Kubernetes Submit Queue 2016-09-02 01:36:55 -07:00 committed by GitHub
parent 43093609c1 76b35cf387
commit ca98482da9
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
test/e2e_node/image_list.go
View File

@ -31,14 +31,20 @@ const (
maxImagePullRetries = 5
// Sleep duration between image pull retry attempts.
imagePullRetryDelay = time.Second
busyBoxImage = iota
busyBoxImage = iota
epTestImage
hostExecImage
livenessImage
mountTestImage5
mountTestImage6
mountTestImage7
mountTestUserImage
netExecImage
nginxImage
mountTestImage
testWebServer
pauseImage
serveHostnameImage
testWebServer
// Images just used for explicitly testing pulling of images
pullTestAlpine
@ -48,13 +54,19 @@ const (
)
var ImageRegistry = map[int]string{
busyBoxImage: "gcr.io/google_containers/busybox:1.24",
hostExecImage: "gcr.io/google_containers/hostexec:1.2",
netExecImage: "gcr.io/google_containers/netexec:1.4",
nginxImage: "gcr.io/google_containers/nginx-slim:0.7",
mountTestImage: "gcr.io/google_containers/mounttest:0.6",
testWebServer: "gcr.io/google_containers/test-webserver:e2e",
pauseImage: framework.GetPauseImageNameForHostArch(),
busyBoxImage: "gcr.io/google_containers/busybox:1.24",
epTestImage: "gcr.io/google_containers/eptest:0.1",
hostExecImage: "gcr.io/google_containers/hostexec:1.2",
livenessImage: "gcr.io/google_containers/liveness:e2e",
mountTestImage5: "gcr.io/google_containers/mounttest:0.5",
mountTestImage6: "gcr.io/google_containers/mounttest:0.6",
mountTestImage7: "gcr.io/google_containers/mounttest:0.7",
mountTestUserImage: "gcr.io/google_containers/mounttest-user:0.3",
netExecImage: "gcr.io/google_containers/netexec:1.4",
nginxImage: "gcr.io/google_containers/nginx-slim:0.7",
pauseImage: framework.GetPauseImageNameForHostArch(),
serveHostnameImage: "gcr.io/google_containers/serve_hostname:v1.4",
testWebServer: "gcr.io/google_containers/test-webserver:e2e",
}
// These are used by tests that explicitly test the ability to pull images