From b67b359a1b493fca046973961c56dce48aaa0359 Mon Sep 17 00:00:00 2001 From: Eric Tune Date: Sun, 23 Nov 2014 06:44:49 -0800 Subject: [PATCH] Do not use nginx image in e2e test --- cmd/e2e/e2e.go | 2 +- cmd/e2e/pod.json | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 cmd/e2e/pod.json diff --git a/cmd/e2e/e2e.go b/cmd/e2e/e2e.go index b00beeec41a..396fd4f2983 100644 --- a/cmd/e2e/e2e.go +++ b/cmd/e2e/e2e.go @@ -182,7 +182,7 @@ func TestKubeletSendsEvent(c *client.Client) bool { podClient := c.Pods(api.NamespaceDefault) - pod := loadPodOrDie("./api/examples/pod.json") + pod := loadPodOrDie("./cmd/e2e/pod.json") value := strconv.Itoa(time.Now().Nanosecond()) pod.Labels["time"] = value diff --git a/cmd/e2e/pod.json b/cmd/e2e/pod.json new file mode 100644 index 00000000000..d6cc38eac82 --- /dev/null +++ b/cmd/e2e/pod.json @@ -0,0 +1,23 @@ +{ + "kind": "Pod", + "apiVersion": "v1beta1", + "id": "p", + "desiredState": { + "manifest": { + "version": "v1beta1", + "id": "p", + "containers": [{ + "name": "p", + "image": "kubernetes/serve_hostname", + "ports": [{ + "containerPort": 80, + "hostPort": 8080 + }], + }] + } + }, + "labels": { + "name": "foo" + } +} +