Merge pull request kubernetes#2555 from erictune/cleanup4

Do not use nginx image in e2e test
duda · Nov 24, 2014 · a25d865 · a25d865
2 parents 4b2a5cd + b67b359
commit a25d865
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git 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
@@ -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"
+  }
+}
+