Convert load of test/e2e/pod.json into native Go definition of the api.Pod

This is another step in removing external dependencies of the Go e2e tests.

Also remove other references to this file.

Tested by running cmd/e2e -t TestKubeletSendsEvent against an API server in GCE.
This commit is contained in:
Filipe Brandenburger 2015-01-30 13:15:38 -08:00
parent aa3b45d17b
commit a74fce5bd7
3 changed files with 20 additions and 27 deletions

View File

@ -52,7 +52,6 @@ readonly KUBE_TEST_BINARIES=("${KUBE_TEST_TARGETS[@]##*/}")
readonly KUBE_TEST_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}")
readonly KUBE_TEST_PORTABLE=(
api/examples/pod.json
test/e2e/pod.json
contrib/for-tests/network-tester/rc.json
contrib/for-tests/network-tester/service.json
hack/e2e.go

View File

@ -23,6 +23,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog"
. "github.com/onsi/ginkgo"
@ -39,10 +40,26 @@ func TestKubeletSendsEvent(c *client.Client) bool {
podClient := c.Pods(api.NamespaceDefault)
pod := loadPodOrDie(assetPath("test", "e2e", "pod.json"))
name := "send-events-" + string(util.NewUUID())
value := strconv.Itoa(time.Now().Nanosecond())
pod.Labels["time"] = value
pod := &api.Pod{
ObjectMeta: api.ObjectMeta{
Name: name,
Labels: map[string]string{
"name": "foo",
"time": value,
},
},
Spec: api.PodSpec{
Containers: []api.Container{
{
Name: "p",
Image: "kubernetes/serve_hostname",
Ports: []api.Port{{ContainerPort: 80, HostPort: 8080}},
},
},
},
}
_, err := podClient.Create(pod)
if err != nil {
glog.Errorf("Failed to create pod: %v", err)

View File

@ -1,23 +0,0 @@
{
"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"
}
}