github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add image white list, images in white list will be prepulled, and

Browse Source 
only images in white list could be used in the test. Currently only
enabled in node e2e test.
This commit is contained in:
Random-Liu
2016-09-15 14:49:14 -07:00
parent 920581d964
commit ed411c9042
16 changed files with 102 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/e2e_node/runtime_conformance_test.go
View File

@@ -45,7 +45,7 @@ var _ = framework.KubeDescribe("Container Runtime Conformance Test", func() {
restartCountVolumeName := "restart-count"
restartCountVolumePath := "/restart-count"
testContainer := api.Container{
Image: ImageRegistry[busyBoxImage],
Image: "gcr.io/google_containers/busybox:1.24",
VolumeMounts: []api.VolumeMount{
{
MountPath: restartCountVolumePath,
@@ -136,7 +136,7 @@ while true; do sleep 1; done
c := ConformanceContainer{
PodClient: f.PodClient(),
Container: api.Container{
Image: ImageRegistry[busyBoxImage],
Image: "gcr.io/google_containers/busybox:1.24",
Name: name,
Command: []string{"/bin/sh", "-c"},
Args: []string{fmt.Sprintf("/bin/echo -n %s > %s", terminationMessage, terminationMessagePath)},
@@ -185,6 +185,9 @@ while true; do sleep 1; done
Data: map[string][]byte{api.DockerConfigJsonKey: []byte(auth)},
Type: api.SecretTypeDockerConfigJson,
}
// The following images are not added into NodeImageWhiteList, because this test is
// testing image pulling, these images don't need to be prepulled. The ImagePullPolicy
// is api.PullAlways, so it won't be blocked by framework image white list check.
for _, testCase := range []struct {
description string
image string
@@ -206,25 +209,25 @@ while true; do sleep 1; done
},
{
description: "should be able to pull image from gcr.io",
image: NoPullImageRegistry[pullTestAlpineWithBash],
image: "gcr.io/google_containers/alpine-with-bash:1.0",
phase: api.PodRunning,
waiting: false,
},
{
description: "should be able to pull image from docker hub",
image: NoPullImageRegistry[pullTestAlpine],
image: "alpine:3.1",
phase: api.PodRunning,
waiting: false,
},
{
description: "should not be able to pull from private registry without secret",
image: NoPullImageRegistry[pullTestAuthenticatedAlpine],
image: "gcr.io/authenticated-image-pulling/alpine:3.1",
phase: api.PodPending,
waiting: true,
},
{
description: "should be able to pull from private registry with secret",
image: NoPullImageRegistry[pullTestAuthenticatedAlpine],
image: "gcr.io/authenticated-image-pulling/alpine:3.1",
secret: true,
phase: api.PodRunning,
waiting: false,