github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Use e2e tagged version of test images that aren't versioned

Browse Source
This commit is contained in:
Erick Fejta 2016-02-19 20:22:49 -08:00
parent 5fe856c749
commit 3d8913a43a
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/container_probe.go
View File

@ -148,7 +148,7 @@ func makePodSpec(readinessProbe, livenessProbe *api.Probe) *api.Pod {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: probTestContainerName, Name: probTestContainerName,
Image: "gcr.io/google_containers/test-webserver", Image: "gcr.io/google_containers/test-webserver:e2e",
LivenessProbe: livenessProbe, LivenessProbe: livenessProbe,
ReadinessProbe: readinessProbe, ReadinessProbe: readinessProbe,
}, },

6
test/e2e/dns.go
View File

@ -61,7 +61,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string) *api.Pod {
// TODO: Consider scraping logs instead of running a webserver. // TODO: Consider scraping logs instead of running a webserver.
{ {
Name: "webserver", Name: "webserver",
Image: "gcr.io/google_containers/test-webserver", Image: "gcr.io/google_containers/test-webserver:e2e",
Ports: []api.ContainerPort{ Ports: []api.ContainerPort{
{ {
Name: "http", Name: "http",
@ -77,7 +77,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string) *api.Pod {
}, },
{ {
Name: "querier", Name: "querier",
Image: "gcr.io/google_containers/dnsutils", Image: "gcr.io/google_containers/dnsutils:e2e",
Command: []string{"sh", "-c", wheezyProbeCmd}, Command: []string{"sh", "-c", wheezyProbeCmd},
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
{ {
@ -88,7 +88,7 @@ func createDNSPod(namespace, wheezyProbeCmd, jessieProbeCmd string) *api.Pod {
}, },
{ {
Name: "jessie-querier", Name: "jessie-querier",
Image: "gcr.io/google_containers/jessie-dnsutils", Image: "gcr.io/google_containers/jessie-dnsutils:e2e",
Command: []string{"sh", "-c", jessieProbeCmd}, Command: []string{"sh", "-c", jessieProbeCmd},
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
{ {

2
test/e2e/empty_dir_wrapper.go
View File

@ -134,7 +134,7 @@ var _ = Describe("EmptyDir wrapper volumes", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "secret-test", Name: "secret-test",
Image: "gcr.io/google_containers/test-webserver", Image: "gcr.io/google_containers/test-webserver:e2e",
VolumeMounts: []api.VolumeMount{ VolumeMounts: []api.VolumeMount{
{ {
Name: volumeName, Name: volumeName,

4
test/e2e/pods.go
View File

@ -701,7 +701,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "liveness", Name: "liveness",
Image: "gcr.io/google_containers/liveness", Image: "gcr.io/google_containers/liveness:e2e",
Command: []string{"/server"}, Command: []string{"/server"},
LivenessProbe: &api.Probe{ LivenessProbe: &api.Probe{
Handler: api.Handler{ Handler: api.Handler{
@ -730,7 +730,7 @@ var _ = Describe("Pods", func() {
Containers: []api.Container{ Containers: []api.Container{
{ {
Name: "liveness", Name: "liveness",
Image: "gcr.io/google_containers/liveness", Image: "gcr.io/google_containers/liveness:e2e",
Command: []string{"/server"}, Command: []string{"/server"},
LivenessProbe: &api.Probe{ LivenessProbe: &api.Probe{
Handler: api.Handler{ Handler: api.Handler{

2
test/e2e/service.go
View File

@ -1776,7 +1776,7 @@ func NewServerTest(client *client.Client, namespace string, serviceName string)
t.services = make(map[string]bool) t.services = make(map[string]bool)
t.name = "webserver" t.name = "webserver"
t.image = "gcr.io/google_containers/test-webserver" t.image = "gcr.io/google_containers/test-webserver:e2e"
return t return t
} }