github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #3990 from filbranden/e2e_send_events_remove_external_json

Browse Source 
Convert load of test/e2e/pod.json into native Go definition of the api.Pod
This commit is contained in:
Satnam Singh 2015-01-30 14:37:48 -08:00
commit 218fdc7594
3 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hack/lib/golang.sh
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_BINARIES_WIN=("${KUBE_TEST_BINARIES[@]/%/.exe}")
readonly KUBE_TEST_PORTABLE=( readonly KUBE_TEST_PORTABLE=(
api/examples/pod.json api/examples/pod.json
test/e2e/pod.json
contrib/for-tests/network-tester/rc.json contrib/for-tests/network-tester/rc.json
contrib/for-tests/network-tester/service.json contrib/for-tests/network-tester/service.json
hack/e2e.go hack/e2e.go

23
test/e2e/kubelet_sends_events.go
View File

@ -23,6 +23,7 @@ import (
"github.com/GoogleCloudPlatform/kubernetes/pkg/api" "github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/client" "github.com/GoogleCloudPlatform/kubernetes/pkg/client"
"github.com/GoogleCloudPlatform/kubernetes/pkg/labels" "github.com/GoogleCloudPlatform/kubernetes/pkg/labels"
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
"github.com/golang/glog" "github.com/golang/glog"
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
@ -39,10 +40,26 @@ func TestKubeletSendsEvent(c *client.Client) bool {
podClient := c.Pods(api.NamespaceDefault) podClient := c.Pods(api.NamespaceDefault)
pod := loadPodOrDie(assetPath("test", "e2e", "pod.json")) name := "send-events-" + string(util.NewUUID())
value := strconv.Itoa(time.Now().Nanosecond()) 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) _, err := podClient.Create(pod)
if err != nil { if err != nil {
glog.Errorf("Failed to create pod: %v", err) glog.Errorf("Failed to create pod: %v", err)

23
test/e2e/pod.json
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"
}
}